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

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

@@ -101,12 +101,14 @@ public class TbOrderInfo implements Serializable {
     private List<TbOrderDetail> detailList;
     private String winnnerNo;
     private String isWinner;
+    private String shopName;
 
 
     //根据状态返回 需付款 已付款 未付款 已退
     private String description;
 
-    public void setDescription() {
+    public void setDescription(String shopName) {
+        this.shopName = shopName;
         switch (status) {
             case "closed":
                 this.description = "已付款";

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

@@ -21,6 +21,11 @@ public class TbShopUserFlow implements Serializable {
 
     private String type;
 
+
+    private String isReturn;
+
+    private String remark;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -86,4 +91,20 @@ public class TbShopUserFlow implements Serializable {
     public void setType(String type) {
         this.type = type == null ? null : type.trim();
     }
+
+    public String getIsReturn() {
+        return isReturn;
+    }
+
+    public void setIsReturn(String isReturn) {
+        this.isReturn = isReturn;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }