Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java

@@ -97,4 +97,9 @@ public class SysCustomer extends BaseEntity
     /** 体征数据，非持久化字段 */
     private SysCustomerPhysicalSigns sign;
 
+    @Excel(name = "进粉渠道")
+    private Long channelId;
+
+    private String[] channels;
+
 }

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java

@@ -134,6 +134,8 @@ public class SysOrder extends BaseEntity {
     @Excel(name = "账号")
     private String account;
 
+    private String[] accRange;
+
     /**
      * 策划
      */