FengChaoYu 5 روز پیش
والد
کامیت
af5e2a9b82

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserVO.java

@@ -50,8 +50,8 @@ public class UserVO {
     @ApiModelProperty("身份证图片")
     private String idCardImg;
 
-    @ZfireField(hide = true, tbName = "b")
-    private String slaveWorkerId;
+//    @ZfireField(hide = true, tbName = "b")
+//    private String slaveWorkerId;
 
 //    @ZfireField(tbName = "d", colName = "nick_name", ignoreSelect = true)
 //    @ApiModelProperty("辅助师傅")

+ 2 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/common/LbsAmapLogic.java

@@ -17,7 +17,8 @@ import java.util.Map;
 @Service
 public class LbsAmapLogic {
 
-    private static final String lbsWebKey = "b772f8b0ace6bc96c04ae8e48f241e36";
+//    private static final String lbsWebKey = "b772f8b0ace6bc96c04ae8e48f241e36";
+    private static final String lbsWebKey = "428a7111e02ea8367a3b34804eaa025b";
     /**
      * 根据经纬度反查省市区街道
      * @Param lng,lat

+ 1 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -123,6 +123,7 @@ public class UserLogic {
 //            isOK = count > 0;
 //        }
 
+        userZfireParamBean.setCompanyWechatId("");
         ZfireParamBean zfireParamBean = FieldUtils.supplyParam(userZfireParamBean, UserVO.class, adminUser);
 
         IPage<UserVO> userVOIPage = commonMapper.userList(new Page(userZfireParamBean.getPageNum(), userZfireParamBean.getPageSize()), userZfireParamBean, null, isOK);

+ 1 - 1
mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -87,7 +87,7 @@
 
     <select id="userList" resultType="com.gree.mall.manager.bean.listvo.UserVO">
         select
-        ${ex.selected},
+        ${ex.selected}
         <!--
         b.websit_id,
         c.name as 'websit_name',