修改

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java

@@ -43,6 +43,7 @@ import java.util.*;
 
 import static org.dromara.common.core.constant.Constants.Y;
 import static org.dromara.common.core.constant.TenantConstants.SUPER_ADMIN_ROLE_KEY;
+import static org.dromara.common.core.enums.UserType.*;
 
 /**
  * 租户Service业务层处理
@@ -177,6 +178,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
         user.setDeptId(deptId);
         user.setPhonenumber(bo.getContactPhone());
         user.setIsAuthentication(Y);
+        user.setUserType(PC_USER.getUserType()+","+APP_STAFF.getUserType());
         userMapper.insert(user);
         //新增系统用户后，默认当前用户为部门的负责人
         SysDept sd = new SysDept();

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/controller/staffManage/StaffManageController.java

@@ -50,7 +50,7 @@ public class StaffManageController extends BaseController {
     /**
      * 查询员工管理列表不分页
      */
-    @SaCheckPermission("wuYe:staffManage:list")
+    @SaCheckPermission("wuYe:staffManage:listNoPage")
     @GetMapping("/listNoPage")
     public TableDataInfo<StaffManageVo> listNoPage(StaffManageBo staffManage) {
         List<StaffManageVo> list = staffManageService.queryList(staffManage);

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/assets/CommunityAssets.java

@@ -1,13 +1,14 @@
 package org.dromara.domain.assets;
 
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 社区资产对象 community_assets
@@ -72,6 +73,7 @@ public class CommunityAssets extends TenantEntity {
     /**
      * 设备购买时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date purchaseDate;
 
     /**
@@ -92,6 +94,7 @@ public class CommunityAssets extends TenantEntity {
     /**
      * 设备入库时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date storageTime;
 
     /**
@@ -102,6 +105,7 @@ public class CommunityAssets extends TenantEntity {
     /**
      * 设备出库时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date outboundTime;
 
     /**
@@ -122,6 +126,7 @@ public class CommunityAssets extends TenantEntity {
     /**
      * 最近维护日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date maintenanceDate;
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/assets/bo/CommunityAssetsBo.java

@@ -1,5 +1,6 @@
 package org.dromara.domain.assets.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -77,6 +78,7 @@ public class CommunityAssetsBo extends BaseEntity {
     /**
      * 设备购买时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date purchaseDate;
 
     /**
@@ -97,6 +99,7 @@ public class CommunityAssetsBo extends BaseEntity {
     /**
      * 设备入库时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date storageTime;
 
     /**
@@ -107,6 +110,7 @@ public class CommunityAssetsBo extends BaseEntity {
     /**
      * 设备出库时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date outboundTime;
 
     /**
@@ -127,6 +131,7 @@ public class CommunityAssetsBo extends BaseEntity {
     /**
      * 最近维护日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date maintenanceDate;
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/assets/vo/CommunityAssetsVo.java

@@ -2,6 +2,7 @@ package org.dromara.domain.assets.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
@@ -86,6 +87,7 @@ public class CommunityAssetsVo implements Serializable {
      * 设备购买时间
      */
     @ExcelProperty(value = "设备购买时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date purchaseDate;
 
     /**
@@ -110,6 +112,7 @@ public class CommunityAssetsVo implements Serializable {
      * 设备入库时间
      */
     @ExcelProperty(value = "设备入库时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date storageTime;
 
     /**
@@ -122,6 +125,7 @@ public class CommunityAssetsVo implements Serializable {
      * 设备出库时间
      */
     @ExcelProperty(value = "设备出库时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date outboundTime;
 
     /**
@@ -148,6 +152,7 @@ public class CommunityAssetsVo implements Serializable {
      * 最近维护日期
      */
     @ExcelProperty(value = "最近维护日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date maintenanceDate;
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/checkPoint/CheckPointRecord.java

@@ -1,13 +1,14 @@
 package org.dromara.domain.checkPoint;
 
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 巡更点记录对象 check_point_record
@@ -47,6 +48,7 @@ public class CheckPointRecord extends TenantEntity {
     /**
      * 巡更设定时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date checkTime;
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/checkPoint/bo/CheckPointRecordBo.java

@@ -1,5 +1,6 @@
 package org.dromara.domain.checkPoint.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -48,6 +49,7 @@ public class CheckPointRecordBo extends BaseEntity {
     /**
      * 巡更设定时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date checkTime;
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/checkPoint/vo/CheckPointRecordVo.java

@@ -2,6 +2,7 @@ package org.dromara.domain.checkPoint.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.domain.checkPoint.CheckPointRecord;
@@ -54,6 +55,7 @@ public class CheckPointRecordVo implements Serializable {
      * 巡更设定时间
      */
     @ExcelProperty(value = "巡更设定时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date checkTime;
 
     /**