Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/dto/ClerkDTO.java

@@ -55,6 +55,11 @@ public class ClerkDTO implements Serializable {
     private String phoneNumber;
 
     /**
+     * 好办绑定状态  1：绑定   0：未绑定
+     */
+    private Integer haobanStatus;
+
+    /**
      * 状态（1:启用， 2:不启用）
      */
     private Integer status;
@@ -68,6 +73,7 @@ public class ClerkDTO implements Serializable {
     private String operatorName;
     private String storeName;
 
+
     public Integer getClerkId() {
         return clerkId;
     }
@@ -187,4 +193,12 @@ public class ClerkDTO implements Serializable {
     public void setStoreName(String storeName) {
         this.storeName = storeName;
     }
+
+    public Integer getHaobanStatus() {
+        return haobanStatus;
+    }
+
+    public void setHaobanStatus(Integer haobanStatus) {
+        this.haobanStatus = haobanStatus;
+    }
 }

gic-store-service/pom.xml

@@ -149,6 +149,11 @@
             <artifactId>application-center-api</artifactId>
             <version>${application-center-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-marketing-process-api</artifactId>
+            <version>${gic-marketing-process-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

gic-store-service/src/main/resources/dubbo-gic-store-service.xml

@@ -63,4 +63,5 @@
     <dubbo:service interface="com.gic.store.service.StoreTagApiService" ref="storeTagApiService" timeout="6000" />
     <dubbo:service interface="com.gic.store.service.StoreTagTmpApiService" ref="storeTagTmpApiService" timeout="6000" />
     <dubbo:service interface="com.gic.store.service.StoreOpenApiService" ref="storeOpenApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.marketing.process.api.service.tmpl.WxTemplateRouterApiService" id="wxTemplateRouterApiService" timeout="60000" />
 </beans>