配置文件提交2

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppUser.java

@@ -99,6 +99,6 @@ public class AppUser extends TenantEntity {
     /**
      * 地区
      */
-    private String region;
+//    private String region;
 
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppUserVo.java

@@ -5,6 +5,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fuyuanshen.app.domain.AppUser;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -87,6 +89,8 @@ public class AppUserVo implements Serializable {
      * 密码
      */
     @ExcelProperty(value = "密码")
+    @JsonIgnore
+    @JsonProperty
     private String password;
 
     /**

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppUserServiceImpl.java

@@ -177,7 +177,7 @@ public class AppUserServiceImpl implements IAppUserService {
         appUserVo.setNickName(user.getNickName());
         appUserVo.setGender(user.getSex());
         appUserVo.setPhone(user.getPhonenumber());
-        appUserVo.setRegion(user.getRegion());
+//        appUserVo.setRegion(user.getRegion());
         if(user.getAvatar() != null){
             SysOssVo oss = sysOssService.getById(user.getAvatar());
             if(oss != null){
@@ -203,7 +203,7 @@ public class AppUserServiceImpl implements IAppUserService {
             updUser.setAvatar(oss.getOssId());
         }
 
-        updUser.setRegion(bo.getRegion());
+//        updUser.setRegion(bo.getRegion());
         updUser.setSex(bo.getGender());
         return baseMapper.update(updUser, new LambdaQueryWrapper<AppUser>().eq(AppUser::getUserId, appUser.getUserId()));
     }

fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.id,a.business_id,a.file_id,b.file_name,b.url fileUrl from app_business_file a left join sys_oss b on a.file_id = b.oss_id
         where 1=1
         <if test="createBy != null">
-            a.create_by = #{createBy}
+             and a.create_by = #{createBy}
         </if>
         <if test="businessId != null">
             and a.business_id = #{businessId}
@@ -19,9 +19,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="fileType != null">
             and a.file_type = #{fileType}
         </if>
-        <if test="createBy != null">
-            and a.create_by = #{createBy}
-        </if>
         order by a.create_time desc
     </select>
 </mapper>

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java

@@ -57,6 +57,11 @@ public class AppDeviceVo implements Serializable {
      */
     private Date bindingTime;
 
+    /**
+     * 绑定人
+     */
+    private Date bindingBy;
+
     /**
      * 在线状态(0离线，1在线)
      */