Merge branch 'feature-recommend' into 'developer'

门店类型

See merge request !2781

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/potential/PotentialDataController.java

@@ -230,16 +230,15 @@ public class PotentialDataController {
         if (storeDTO != null) {
             storeId = storeDTO.getStoreId();
         }
-        String clerkTypeStr = "0";
+        String clerkTypeStr = "1";
         CustomerDTO params = new CustomerDTO();
         String clerkId = null;
         if (clerkDTO != null) {
+            clerkTypeStr = "0";
             clerkId = clerkDTO.getClerkId();
             Integer clerkType = clerkDTO.getClerkType();
             if (clerkType == 0 || clerkType == 1) {
                 storeId = clerkDTO.getStoreId();
-            }else {
-                clerkTypeStr = "2";
             }
         }
         ContactParamDTO contact = new ContactParamDTO();