Merge branch 'developer' into 'master'

嘉哥userId

See merge request !103

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

@@ -270,6 +270,7 @@ public class InfoController extends WebBaseController{
                 StoreDTO store = storeService.getStore(dto.getStoreId());
                 ClerkDTO clerkDTO = clerkService.getClerkByClerkId(dto.getClerkId());
                 if (null != store&&clerkDTO!=null) {
+                    VO.setUserId(staffDTO.getWxUserId());
                     VO.setStoreId(dto.getStoreId());//为空，则无该值
                     VO.setStoreName(dto.getStoreName());
                     VO.setWxEnterpriseId(dto.getWxEnterpriseId());

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

@@ -11,7 +11,8 @@ import java.util.Date;
 public class StoreMemberVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private String storeId;
-    private String staffId;
+	private String userId;
+	private String staffId;
     private String storeName;
     private String wxEnterpriseId;
     private String enterpriseId;
@@ -21,6 +22,14 @@ public class StoreMemberVO implements Serializable {
     private int clerkType;
 	private int bindFlag;
 
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
 	public int getBindFlag() {
 		return bindFlag;
 	}