Merge remote-tracking branch 'origin/hph' into test

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java

@@ -92,6 +92,24 @@ public class TbShopInfo implements Serializable {
 
     private String view;
 
+
+
+    private String isCustom;
+
+
+    private String isReturn;
+
+
+    private String isMemberIn;
+
+
+    private String isMemberReturn;
+
+
+
+
+
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -445,4 +463,36 @@ public class TbShopInfo implements Serializable {
     public void setView(String view) {
         this.view = view == null ? null : view.trim();
     }
+
+    public String getIsCustom() {
+        return isCustom;
+    }
+
+    public void setIsCustom(String isCustom) {
+        this.isCustom = isCustom;
+    }
+
+    public String getIsReturn() {
+        return isReturn;
+    }
+
+    public void setIsReturn(String isReturn) {
+        this.isReturn = isReturn;
+    }
+
+    public String getIsMemberIn() {
+        return isMemberIn;
+    }
+
+    public void setIsMemberIn(String isMemberIn) {
+        this.isMemberIn = isMemberIn;
+    }
+
+    public String getIsMemberReturn() {
+        return isMemberReturn;
+    }
+
+    public void setIsMemberReturn(String isMemberReturn) {
+        this.isMemberReturn = isMemberReturn;
+    }
 }