Merge branch 'feature-recommend' into 'developer'

增加门店类型

See merge request !2764

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StoreClerkInfoVO.java

@@ -40,6 +40,11 @@ public class StoreClerkInfoVO {
      */
     private String storeName;
 
+    /**
+     * 0-正价店，1-折扣店
+     */
+    private Integer storeDiscountType;
+
     public void setClerk(ClerkDTO clerkDTO) {
         if (clerkDTO == null) {
             return;
@@ -56,6 +61,7 @@ public class StoreClerkInfoVO {
         this.setStoreId(storeDTO.getStoreId());
         this.setStoreCode(storeDTO.getStoreCode());
         this.setStoreName(storeDTO.getStoreName());
+        this.setStoreDiscountType(storeDTO.getStoreDiscountType());
     }
 
 }