diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/BusMachineryDetail.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/BusMachineryDetail.java
index 37a99336..25175dc1 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/BusMachineryDetail.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/BusMachineryDetail.java
@@ -1,13 +1,14 @@
 package org.dromara.machinery.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 机械详情对象 bus_machinery_detail
@@ -47,12 +48,12 @@ public class BusMachineryDetail extends BaseEntity {
     /**
      * 施工类型状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
     /**
      * 0入场 1出场
      */
-    private Long type;
+    private String type;
 
     /**
      * 入场时间
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/bo/BusMachineryBo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/bo/BusMachineryBo.java
deleted file mode 100644
index b004a0ab..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/bo/BusMachineryBo.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.dromara.machinery.domain.bo;
-
-import org.dromara.machinery.domain.BusMachinery;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
- * 机械业务对象 bus_machinery
- *
- * @author lcj
- * @date 2025-03-07
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = BusMachinery.class, reverseConvertGenerate = false)
-public class BusMachineryBo extends BaseEntity {
-
-    /**
-     * 主键id
-     */
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 机械名称
-     */
-    private String machineryName;
-
-    /**
-     * 机械型号
-     */
-    private String machineryNumber;
-
-    /**
-     * 项目id
-     */
-    private Long projectId;
-
-    /**
-     * 数量
-     */
-    private Long number;
-
-    /**
-     * 负责人
-     */
-    private String principal;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/bo/BusMachineryDetailBo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/bo/BusMachineryDetailBo.java
deleted file mode 100644
index daf9102d..00000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/bo/BusMachineryDetailBo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.dromara.machinery.domain.bo;
-
-import org.dromara.machinery.domain.BusMachineryDetail;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
- * 机械详情业务对象 bus_machinery_detail
- *
- * @author lcj
- * @date 2025-03-07
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = BusMachineryDetail.class, reverseConvertGenerate = false)
-public class BusMachineryDetailBo extends BaseEntity {
-
-    /**
-     * 主键id
-     */
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 检验证编号
-     */
-    private String checkoutNumber;
-
-    /**
-     * 检验单位
-     */
-    private String checkoutUnit;
-
-    /**
-     * 检定日期/有效期
-     */
-    private String checkoutDate;
-
-    /**
-     * 施工类型状态（0正常 1停用）
-     */
-    private Long status;
-
-    /**
-     * 0入场 1出场
-     */
-    private Long type;
-
-    /**
-     * 入场时间
-     */
-    private Date entryTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 图片(英文逗号分隔)
-     */
-    private String picture;
-
-    /**
-     * 机械主键id
-     */
-    private Long machineryId;
-
-
-}
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailCreateReq.java
index a942e7a3..f56e725c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailCreateReq.java
@@ -34,12 +34,12 @@ public class MachineryDetailCreateReq implements Serializable {
     /**
      * 施工类型状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
     /**
      * 0入场 1出场
      */
-    private Long type;
+    private String type;
 
     /**
      * 入场时间
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java
index 7d046d0c..9a984540 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java
@@ -42,12 +42,12 @@ public class MachineryDetailQueryReq extends PageRequest implements Serializable
     /**
      * 施工类型状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
     /**
      * 0入场 1出场
      */
-    private Long type;
+    private String type;
 
     /**
      * 入场时间
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailUpdateReq.java
index 627c2379..333addf2 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailUpdateReq.java
@@ -39,12 +39,12 @@ public class MachineryDetailUpdateReq implements Serializable {
     /**
      * 施工类型状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
     /**
      * 0入场 1出场
      */
-    private Long type;
+    private String type;
 
     /**
      * 入场时间
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java
index 2e24b710..b01f9520 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryDetailVo.java
@@ -13,7 +13,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * 机械详情视图对象 bus_machinery_detail
  *
@@ -57,13 +56,13 @@ public class BusMachineryDetailVo implements Serializable {
      */
     @ExcelProperty(value = "施工类型状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
-    private Long status;
+    private String status;
 
     /**
      * 0入场 1出场
      */
     @ExcelProperty(value = "0入场 1出场")
-    private Long type;
+    private String type;
 
     /**
      * 入场时间
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryVo.java
index 00102abd..a2f5632c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/vo/BusMachineryVo.java
@@ -10,7 +10,6 @@ import java.io.Serial;
 import java.io.Serializable;
 
 
-
 /**
  * 机械视图对象 bus_machinery
  *
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java
index 48ec7b09..46c636e6 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java
@@ -139,8 +139,8 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
         if (machineryService.getById(machineryId) == null) {
             throw new ServiceException("对应机械不存在", HttpStatus.BAD_REQUEST);
         }
-        Long type = entity.getType();
-        if (type == null) {
+        String type = entity.getType();
+        if (StringUtils.isEmpty(type)) {
             throw new ServiceException("请选择入场/出场", HttpStatus.BAD_REQUEST);
         }
     }
@@ -194,8 +194,8 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
         String checkoutNumber = req.getCheckoutNumber();
         String checkoutUnit = req.getCheckoutUnit();
         String checkoutDate = req.getCheckoutDate();
-        Long status = req.getStatus();
-        Long type = req.getType();
+        String status = req.getStatus();
+        String type = req.getType();
         Date entryTime = req.getEntryTime();
         String remark = req.getRemark();
         Long machineryId = req.getMachineryId();
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusCompany.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusCompany.java
index 9993ca0e..db438d6a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusCompany.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusCompany.java
@@ -43,7 +43,7 @@ public class BusCompany extends BaseEntity {
     /**
      * 帐号状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterials.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterials.java
index 310efb5d..01e914ab 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterials.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterials.java
@@ -1,15 +1,14 @@
 package org.dromara.materials.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 材料名称对象 bus_materials
@@ -119,7 +118,7 @@ public class BusMaterials extends BaseEntity {
     /**
      * 状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
     /**
      * 删除时间
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterialsInventory.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterialsInventory.java
index 94335022..2bbf5145 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterialsInventory.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/BusMaterialsInventory.java
@@ -1,15 +1,14 @@
 package org.dromara.materials.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 材料出/入库对象 bus_materials_inventory
@@ -44,7 +43,7 @@ public class BusMaterialsInventory extends BaseEntity {
     /**
      * 出入库状态
      */
-    private Long outPut;
+    private String outPut;
 
     /**
      * 出/入库的数量
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java
index 5dbf7ed2..fd356c76 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java
@@ -36,7 +36,7 @@ public class CompanyQueryReq extends PageRequest implements Serializable {
     /**
      * 帐号状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyUpdateReq.java
index e0dfff54..0f50c98d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyUpdateReq.java
@@ -33,7 +33,7 @@ public class CompanyUpdateReq implements Serializable {
     /**
      * 帐号状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java
index 0b39cacc..cdd63737 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java
@@ -61,6 +61,6 @@ public class MaterialsQueryReq extends PageRequest implements Serializable {
     /**
      * 状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsUpdateReq.java
index 128e29ef..1a9b2975 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsUpdateReq.java
@@ -108,6 +108,6 @@ public class MaterialsUpdateReq implements Serializable {
     /**
      * 状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryCreateReq.java
index d1bb5f0a..592373c5 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryCreateReq.java
@@ -29,7 +29,7 @@ public class MaterialsInventoryCreateReq implements Serializable {
     /**
      * 出入库状态
      */
-    private Long outPut;
+    private String outPut;
 
     /**
      * 出/入库的数量
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java
index 27c90aad..b351e858 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java
@@ -37,7 +37,7 @@ public class MaterialsInventoryQueryReq extends PageRequest implements Serializa
     /**
      * 出入库状态
      */
-    private Long outPut;
+    private String outPut;
 
     /**
      * 出/入库的数量
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryUpdateReq.java
index 8dd34109..f07f0946 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryUpdateReq.java
@@ -34,7 +34,7 @@ public class MaterialsInventoryUpdateReq implements Serializable {
     /**
      * 出入库状态
      */
-    private Long outPut;
+    private String outPut;
 
     /**
      * 出/入库的数量
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusCompanyVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusCompanyVo.java
index c0d5c5c1..d0644039 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusCompanyVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusCompanyVo.java
@@ -1,18 +1,15 @@
 package org.dromara.materials.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.materials.domain.BusCompany;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.materials.domain.BusCompany;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 
 
@@ -53,7 +50,7 @@ public class BusCompanyVo implements Serializable {
      */
     @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
-    private Long status;
+    private String status;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java
index 961cbdbd..815af691 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java
@@ -1,15 +1,12 @@
 package org.dromara.materials.domain.vo;
 
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.materials.domain.BusMaterialsInventory;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.materials.domain.BusMaterialsInventory;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -58,7 +55,7 @@ public class BusMaterialsInventoryVo implements Serializable {
      * 出入库状态
      */
     @ExcelProperty(value = "出入库状态")
-    private Long outPut;
+    private String outPut;
 
     /**
      * 出/入库的数量
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java
index 353d180f..d4fe4a37 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsVo.java
@@ -145,7 +145,7 @@ public class BusMaterialsVo implements Serializable {
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
-    private Long status;
+    private String status;
 
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java
index 0ded0047..856e6788 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java
@@ -181,7 +181,7 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
         Long id = req.getId();
         String companyName = req.getCompanyName();
         Long projectId = req.getProjectId();
-        Long status = req.getStatus();
+        String status = req.getStatus();
         String remark = req.getRemark();
         String qualification = req.getQualification();
         String sortField = req.getSortField();
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsInventoryServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsInventoryServiceImpl.java
index c7611b62..14efe44e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsInventoryServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsInventoryServiceImpl.java
@@ -140,7 +140,7 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
         // TODO 做一些数据校验,如唯一约束
         Long materialsId = entity.getMaterialsId();
         Long projectId = entity.getProjectId();
-        Long outPut = entity.getOutPut();
+        String outPut = entity.getOutPut();
         if (materialsId == null) {
             throw new ServiceException("材料信息 id 不能为空", HttpStatus.BAD_REQUEST);
         }
@@ -153,7 +153,7 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
         if (projectService.getById(projectId) == null) {
             throw new ServiceException("对应项目不存在", HttpStatus.BAD_REQUEST);
         }
-        if (outPut == null) {
+        if (StringUtils.isEmpty(outPut)) {
             throw new ServiceException("出入库状态不能为空", HttpStatus.BAD_REQUEST);
         }
     }
@@ -211,7 +211,7 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
         Long id = req.getId();
         Long materialsId = req.getMaterialsId();
         Long projectId = req.getProjectId();
-        Long outPut = req.getOutPut();
+        String outPut = req.getOutPut();
         Long number = req.getNumber();
         Date outPutTime = req.getOutPutTime();
         Long residue = req.getResidue();
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java
index 1aa00693..dcec6726 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java
@@ -213,7 +213,7 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
         String weightId = req.getWeightId();
         String remark = req.getRemark();
         String quantityCount = req.getQuantityCount();
-        Long status = req.getStatus();
+        String status = req.getStatus();
         String sortField = req.getSortField();
         String sortOrder = req.getSortOrder();
         String underlineSortField = StrUtil.toUnderlineCase(sortField);
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUser.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUser.java
index 2365f233..55e6933e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUser.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionUser.java
@@ -68,7 +68,7 @@ public class BusConstructionUser extends BaseEntity {
     /**
      * 状态（0在职 1离职）
      */
-    private Long status;
+    private String status;
 
     /**
      * 是否代打
@@ -138,12 +138,12 @@ public class BusConstructionUser extends BaseEntity {
     /**
      * 工种(字典type_of_work)
      */
-    private Long typeOfWork;
+    private String typeOfWork;
 
     /**
      * 打卡(0启用打卡 1禁止打卡)
      */
-    private Long clock;
+    private String clock;
 
     /**
      * 入场时间
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java
index 23144fab..dad6cd58 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java
@@ -48,7 +48,7 @@ public class BusProject extends BaseEntity {
     /**
      * 状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
     /**
      * 项目图片
@@ -78,7 +78,7 @@ public class BusProject extends BaseEntity {
     /**
      * 项目类型（1光伏 2风电）
      */
-    private Long isType;
+    private String isType;
 
     /**
      * 删除时间
@@ -138,7 +138,7 @@ public class BusProject extends BaseEntity {
     /**
      * 显示隐藏（0显示 1隐藏）
      */
-    private Long showHidden;
+    private String showHidden;
 
     /**
      * 是否删除（0正常 1删除）
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeam.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeam.java
index d2d97190..c1452bbb 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeam.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeam.java
@@ -43,7 +43,7 @@ public class BusProjectTeam extends BaseEntity {
     /**
      * 范围内打卡（0范围内打卡 1任何地点打卡）默认为1
      */
-    private Long isClockIn;
+    private String isClockIn;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeamMember.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeamMember.java
index ffd07e19..be212ad7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeamMember.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeamMember.java
@@ -45,7 +45,7 @@ public class BusProjectTeamMember implements Serializable {
     /**
      * 岗位（默认为0普通员工，1组长）
      */
-    private Long postId;
+    private String postId;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserCreateReq.java
index f0de3bf7..5cd8d08c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserCreateReq.java
@@ -53,7 +53,7 @@ public class ConstructionUserCreateReq implements Serializable {
     /**
      * 状态（0在职 1离职）
      */
-    private Long status;
+    private String status;
 
     /**
      * 是否代打
@@ -123,12 +123,12 @@ public class ConstructionUserCreateReq implements Serializable {
     /**
      * 工种(字典type_of_work)
      */
-    private Long typeOfWork;
+    private String typeOfWork;
 
     /**
      * 打卡(0启用打卡 1禁止打卡)
      */
-    private Long clock;
+    private String clock;
 
     /**
      * 入场时间
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java
index 428cdd67..1aba9c9f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java
@@ -61,7 +61,7 @@ public class ConstructionUserQueryReq extends PageRequest implements Serializabl
     /**
      * 状态（0在职 1离职）
      */
-    private Long status;
+    private String status;
 
     /**
      * 是否代打
@@ -131,12 +131,12 @@ public class ConstructionUserQueryReq extends PageRequest implements Serializabl
     /**
      * 工种(字典type_of_work)
      */
-    private Long typeOfWork;
+    private String typeOfWork;
 
     /**
      * 打卡(0启用打卡 1禁止打卡)
      */
-    private Long clock;
+    private String clock;
 
     /**
      * 薪水
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateReq.java
index 7b8eccb2..14a81a54 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserUpdateReq.java
@@ -58,7 +58,7 @@ public class ConstructionUserUpdateReq implements Serializable {
     /**
      * 状态（0在职 1离职）
      */
-    private Long status;
+    private String status;
 
     /**
      * 是否代打
@@ -128,12 +128,12 @@ public class ConstructionUserUpdateReq implements Serializable {
     /**
      * 工种(字典type_of_work)
      */
-    private Long typeOfWork;
+    private String typeOfWork;
 
     /**
      * 打卡(0启用打卡 1禁止打卡)
      */
-    private Long clock;
+    private String clock;
 
     /**
      * 入场时间
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectCreateReq.java
index 1d577439..3c9d9575 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectCreateReq.java
@@ -58,7 +58,7 @@ public class ProjectCreateReq implements Serializable {
     /**
      * 项目类型（1光伏 2风电）
      */
-    private Long isType;
+    private String isType;
 
     /**
      * 项目地址
@@ -113,5 +113,5 @@ public class ProjectCreateReq implements Serializable {
     /**
      * 显示隐藏（0显示 1隐藏）
      */
-    private Long showHidden;
+    private String showHidden;
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java
index 0b64055c..00e78582 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java
@@ -41,7 +41,7 @@ public class ProjectQueryReq extends PageRequest implements Serializable {
     /**
      * 状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
     /**
      * 经度
@@ -66,7 +66,7 @@ public class ProjectQueryReq extends PageRequest implements Serializable {
     /**
      * 项目类型（1光伏 2风电）
      */
-    private Long isType;
+    private String isType;
 
     /**
      * 项目地址
@@ -111,5 +111,5 @@ public class ProjectQueryReq extends PageRequest implements Serializable {
     /**
      * 显示隐藏（0显示 1隐藏）
      */
-    private Long showHidden;
+    private String showHidden;
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectUpdateReq.java
index 2a4dd83a..2ae2750e 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectUpdateReq.java
@@ -38,7 +38,7 @@ public class ProjectUpdateReq implements Serializable {
     /**
      * 状态（0正常 1停用）
      */
-    private Long status;
+    private String status;
 
     /**
      * 项目图片
@@ -68,7 +68,7 @@ public class ProjectUpdateReq implements Serializable {
     /**
      * 项目类型（1光伏 2风电）
      */
-    private Long isType;
+    private String isType;
 
     /**
      * 项目地址
@@ -118,5 +118,5 @@ public class ProjectUpdateReq implements Serializable {
     /**
      * 显示隐藏（0显示 1隐藏）
      */
-    private Long showHidden;
+    private String showHidden;
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamCreateReq.java
index edc4e2a4..b70fa61b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamCreateReq.java
@@ -28,7 +28,7 @@ public class ProjectTeamCreateReq implements Serializable {
     /**
      * 范围内打卡（0范围内打卡 1任何地点打卡）默认为1
      */
-    private Long isClockIn;
+    private String isClockIn;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java
index 2e02e97f..944a8faa 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java
@@ -36,7 +36,7 @@ public class ProjectTeamQueryReq extends PageRequest implements Serializable {
     /**
      * 范围内打卡（0范围内打卡 1任何地点打卡）默认为1
      */
-    private Long isClockIn;
+    private String isClockIn;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamUpdateReq.java
index a2bb4d10..bd2bd816 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamUpdateReq.java
@@ -33,7 +33,7 @@ public class ProjectTeamUpdateReq implements Serializable {
     /**
      * 范围内打卡（0范围内打卡 1任何地点打卡）默认为1
      */
-    private Long isClockIn;
+    private String isClockIn;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberCreateReq.java
index 4771cb13..a63149dd 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberCreateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberCreateReq.java
@@ -33,7 +33,7 @@ public class ProjectTeamMemberCreateReq implements Serializable {
     /**
      * 岗位（默认为0普通员工，1组长）
      */
-    private Long postId;
+    private String postId;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java
index 9b4602b2..54812f66 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java
@@ -41,7 +41,7 @@ public class ProjectTeamMemberQueryReq extends PageRequest implements Serializab
     /**
      * 岗位（默认为0普通员工，1组长）
      */
-    private Long postId;
+    private String postId;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberUpdateReq.java
index e063aab4..16cb3980 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberUpdateReq.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberUpdateReq.java
@@ -38,7 +38,7 @@ public class ProjectTeamMemberUpdateReq implements Serializable {
     /**
      * 岗位（默认为0普通员工，1组长）
      */
-    private Long postId;
+    private String postId;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java
index c2e2d7e6..6054b7cf 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java
@@ -85,7 +85,7 @@ public class BusConstructionUserVo implements Serializable {
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=在职,1=离职")
-    private Long status;
+    private String status;
 
     /**
      * 是否代打
@@ -170,13 +170,13 @@ public class BusConstructionUserVo implements Serializable {
      */
     @ExcelProperty(value = "工种(字典type_of_work)", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "type_of_work")
-    private Long typeOfWork;
+    private String typeOfWork;
 
     /**
      * 打卡(0启用打卡 1禁止打卡)
      */
     @ExcelProperty(value = "打卡(0启用打卡 1禁止打卡)")
-    private Long clock;
+    private String clock;
 
     /**
      * 入场时间
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamMemberVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamMemberVo.java
index 340f1f25..7c50bf8c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamMemberVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamMemberVo.java
@@ -61,7 +61,7 @@ public class BusProjectTeamMemberVo implements Serializable {
      */
     @ExcelProperty(value = "岗位", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "默认为0普通员工，1组长")
-    private Long postId;
+    private String postId;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamVo.java
index 13eb499f..4dda07c9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectTeamVo.java
@@ -53,7 +53,7 @@ public class BusProjectTeamVo implements Serializable {
      */
     @ExcelProperty(value = "范围内打卡", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=范围内打卡,1=任何地点打卡")
-    private Long isClockIn;
+    private String isClockIn;
 
     /**
      * 备注
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectVo.java
index 8d1a9ffc..fb218731 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusProjectVo.java
@@ -55,7 +55,7 @@ public class BusProjectVo implements Serializable {
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
-    private Long status;
+    private String status;
 
     /**
      * 项目图片
@@ -92,7 +92,7 @@ public class BusProjectVo implements Serializable {
      */
     @ExcelProperty(value = "项目类型", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "1=光伏,2=风电")
-    private Long isType;
+    private String isType;
 
     /**
      * 项目地址
@@ -154,6 +154,6 @@ public class BusProjectVo implements Serializable {
      */
     @ExcelProperty(value = "显示隐藏", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "1=显示,2=隐藏")
-    private Long showHidden;
+    private String showHidden;
 
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java
index 84db9d0d..b5608f9b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java
@@ -217,7 +217,7 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
         Long contractorId = req.getContractorId();
         Long teamId = req.getTeamId();
         Long notTeamId = req.getNotTeamId();
-        Long status = req.getStatus();
+        String status = req.getStatus();
         Long isPinch = req.getIsPinch();
         String phone = req.getPhone();
         Long sex = req.getSex();
@@ -231,8 +231,8 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
         String yhkNumber = req.getYhkNumber();
         String yhkOpeningBank = req.getYhkOpeningBank();
         String yhkCardholder = req.getYhkCardholder();
-        Long typeOfWork = req.getTypeOfWork();
-        Long clock = req.getClock();
+        String typeOfWork = req.getTypeOfWork();
+        String clock = req.getClock();
         Long salary = req.getSalary();
         String remark = req.getRemark();
         String sortField = req.getSortField();
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
index 07cd7ba5..99316b18 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
@@ -217,10 +217,10 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
         String projectName = req.getProjectName();
         String shortName = req.getShortName();
         Long pId = req.getPId();
-        Long status = req.getStatus();
+        String status = req.getStatus();
         String remark = req.getRemark();
         String type = req.getType();
-        Long isType = req.getIsType();
+        String isType = req.getIsType();
         String projectSite = req.getProjectSite();
         String principal = req.getPrincipal();
         String principalPhone = req.getPrincipalPhone();
@@ -229,7 +229,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
         String onStreamTime = req.getOnStreamTime();
         String punchRange = req.getPunchRange();
         Long designTotal = req.getDesignTotal();
-        Long showHidden = req.getShowHidden();
+        String showHidden = req.getShowHidden();
         String sortField = req.getSortField();
         String sortOrder = req.getSortOrder();
         String underlineSortField = StrUtil.toUnderlineCase(sortField);
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
index 49ef364d..5910c108 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
@@ -252,7 +252,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
         Long teamId = req.getTeamId();
         Long projectId = req.getProjectId();
         Long memberId = req.getMemberId();
-        Long postId = req.getPostId();
+        String postId = req.getPostId();
         String remark = req.getRemark();
         String sortField = req.getSortField();
         String sortOrder = req.getSortOrder();
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
index 617e16a9..f3047dda 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
@@ -203,7 +203,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
         Long id = req.getId();
         Long projectId = req.getProjectId();
         String teamName = req.getTeamName();
-        Long isClockIn = req.getIsClockIn();
+        String isClockIn = req.getIsClockIn();
         String remark = req.getRemark();
         String sortField = req.getSortField();
         String sortOrder = req.getSortOrder();
diff --git a/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql b/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql
index b09d841e..2a83bfa3 100644
--- a/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql
+++ b/RuoYi-Vue-Plus/script/sql/xinnengyuan.sql
@@ -7,13 +7,13 @@ create table `bus_project`
     `project_name`       varchar(64)                           null comment '项目名称',
     `short_name`         varchar(64)                           null comment '项目简称',
     `p_id`               bigint                                null comment '父项目id',
-    `status`             tinyint(4)  default 0                 null comment '状态（0正常 1停用）',
+    `status`             char(1)     default '0'               null comment '状态（0正常 1停用）',
     `pic_url`            varchar(255)                          null comment '项目图片',
     `lng`                varchar(20)                           null comment '经度',
     `lat`                varchar(20)                           null comment '纬度',
     `remark`             varchar(500)                          null comment '备注',
     `type`               varchar(20)                           null comment '项目类型',
-    `is_type`            tinyint(4)                            null comment '项目类型（1光伏 2风电）',
+    `is_type`            char(1)                               null comment '项目类型（1光伏 2风电）',
     `project_site`       varchar(255)                          null comment '项目地址',
     `principal`          varchar(50)                           null comment '负责人',
     `principal_phone`    varchar(50)                           null comment '负责人电话',
@@ -24,7 +24,7 @@ create table `bus_project`
     `design_total`       int         default 0                 not null comment '设计总量',
     `security_agreement` varchar(255)                          null comment '安全协议书',
     `sort`               bigint      default 0                 not null comment '排序字段',
-    `show_hidden`        tinyint(4)  default 0                 not null comment '显示隐藏（0显示 1隐藏）',
+    `show_hidden`        char(1)     default '0'               not null comment '显示隐藏（0显示 1隐藏）',
     `create_by`          bigint                                null comment '创建者',
     `update_by`          bigint                                null comment '更新者',
     `create_time`        datetime    default CURRENT_TIMESTAMP null comment '创建时间',
@@ -61,7 +61,7 @@ CREATE TABLE `bus_company`
     `id`            bigint                               not null auto_increment,
     `company_name`  varchar(64)                          null comment '公司名称',
     `project_id`    bigint                               null comment '项目id',
-    `status`        tinyint(4) default 0                 null comment '帐号状态（0正常 1停用）',
+    `status`        char(1)    default '0'               null comment '帐号状态（0正常 1停用）',
     `remark`        varchar(255)                         null comment '备注',
     `qualification` varchar(255)                         null comment '资质情况',
     `create_by`     varchar(64)                          null comment '创建者',
@@ -98,7 +98,7 @@ CREATE TABLE `bus_materials`
     `weight_id`                   varchar(64)                          null comment '计量单位',
     `remark`                      varchar(255)                         null comment '备注',
     `quantity_count`              varchar(64)                          null comment '预计材料数量',
-    `status`                      tinyint(4) default 0                 null comment '状态（0正常 1停用）',
+    `status`                      char(1)    default '0'               null comment '状态（0正常 1停用）',
     `create_by`                   varchar(64)                          null comment '创建者',
     `update_by`                   varchar(64)                          null comment '更新者',
     `create_time`                 datetime   default CURRENT_TIMESTAMP null comment '创建时间',
@@ -118,7 +118,7 @@ CREATE TABLE `bus_materials_inventory`
     `id`           bigint                               not null auto_increment comment '主键id',
     `materials_id` bigint                               not null comment '材料id',
     `project_id`   bigint                               null comment '项目id',
-    `out_put`      tinyint(4)                           null comment '出入库状态',
+    `out_put`      char(1)                              null comment '出入库状态',
     `number`       int        default 0                 null comment '出/入库的数量',
     `out_put_time` datetime                             null comment '出/入库操作时间',
     `residue`      int        default 0                 null comment '剩余库存数量（记录最后一次操作留下的库存数）',
@@ -188,8 +188,8 @@ CREATE TABLE `bus_construction_user`
     `yhk_number`       varchar(50)                              null comment '银行卡号',
     `yhk_opening_bank` varchar(50)                              null comment '开户行',
     `yhk_cardholder`   varchar(255)                             null comment '持卡人',
-    `type_of_work`     tinyint(4)                               null comment '工种(字典type_of_work)',
-    `clock`            tinyint        default 1                 not null comment '打卡(0启用打卡 1禁止打卡)',
+    `type_of_work`     char(1)                                  null comment '工种(字典type_of_work)',
+    `clock`            char(1)        default '1'               not null comment '打卡(0启用打卡 1禁止打卡)',
     `entry_date`       varchar(255)                             null comment '入场时间',
     `leave_date`       varchar(255)                             null comment '离场时间',
     `salary`           decimal(10, 2) default 0.00              null comment '薪水',
@@ -215,7 +215,7 @@ CREATE TABLE `bus_project_team`
     `id`          bigint                               not null auto_increment comment '主键id',
     `project_id`  bigint                               null comment '项目id',
     `team_name`   varchar(50)                          null comment '班组名称',
-    `is_clock_in` tinyint(4) default 1                 not null comment '范围内打卡（0范围内打卡 1任何地点打卡）默认为1',
+    `is_clock_in` char(1)    default '1'               not null comment '范围内打卡（0范围内打卡 1任何地点打卡）默认为1',
     `remark`      varchar(512)                         null comment '备注',
     `create_by`   varchar(64)                          null comment '创建者',
     `update_by`   varchar(64)                          null comment '更新者',
@@ -237,7 +237,7 @@ CREATE TABLE `bus_project_team_member`
     `team_id`     bigint                             null comment '班组id',
     `project_id`  bigint                             null comment '项目id',
     `member_id`   bigint                             null comment '施工人员id',
-    `post_id`     tinyint  default 0                 null comment '岗位（默认为0普通员工，1组长）',
+    `post_id`     char(1)  default '0'               null comment '岗位（默认为0普通员工，1组长）',
     `remark`      varchar(512)                       null comment '备注',
     `create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间',
     `update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间',
@@ -274,8 +274,8 @@ CREATE TABLE `bus_machinery_detail`
     `checkout_number` varchar(64)                          null comment '检验证编号',
     `checkout_unit`   varchar(64)                          null comment '检验单位',
     `checkout_date`   varchar(64)                          null comment '检定日期/有效期',
-    `status`          tinyint(4) default 0                 null comment '施工类型状态（0正常 1停用）',
-    `type`            tinyint(4) default 0                 null null comment '0入场 1出场',
+    `status`          char(1)    default '0'               null comment '施工类型状态（0正常 1停用）',
+    `type`            char(1)    default '0'               null null comment '0入场 1出场',
     `entry_time`      datetime                             null comment '入场时间',
     `remark`          varchar(512)                         null comment '备注',
     `picture`         varchar(512)                         null comment '图片(英文逗号分隔)',
diff --git a/plus-ui/src/views/materials/materialsInventory/index.vue b/plus-ui/src/views/materials/materialsInventory/index.vue
index 016cf209..97d5fbec 100644
--- a/plus-ui/src/views/materials/materialsInventory/index.vue
+++ b/plus-ui/src/views/materials/materialsInventory/index.vue
@@ -37,19 +37,19 @@
         <el-table-column label="入库登记" align="center">
           <el-table-column label="数量" align="center" prop="number">
             <template #default="scope">
-              <span v-if="scope.row.outPut === 0">{{ scope.row.number }}</span>
+              <span v-if="scope.row.outPut === '0'">{{ scope.row.number }}</span>
               <span v-else></span>
             </template>
           </el-table-column>
           <el-table-column label="签收人" align="center" prop="operator">
             <template #default="scope">
-              <span v-if="scope.row.outPut === 0">{{ scope.row.operator }}</span>
+              <span v-if="scope.row.outPut === '0'">{{ scope.row.operator }}</span>
               <span v-else></span>
             </template>
           </el-table-column>
           <el-table-column label="日期" align="center" prop="outPutTime" width="160">
             <template #default="scope">
-              <span v-if="scope.row.outPut === 0">{{ parseTime(scope.row.outPutTime, '{y}年{m}月{d}日') }}</span>
+              <span v-if="scope.row.outPut === '0'">{{ parseTime(scope.row.outPutTime, '{y}年{m}月{d}日') }}</span>
               <span v-else></span>
             </template>
           </el-table-column>
@@ -58,20 +58,20 @@
           <el-table-column label="交接单位" align="center" prop="recipient" />
           <el-table-column label="数量" align="center" prop="number">
             <template #default="scope">
-              <span v-if="scope.row.outPut === 1">{{ scope.row.number }}</span>
+              <span v-if="scope.row.outPut === '1'">{{ scope.row.number }}</span>
               <span v-else></span>
             </template>
           </el-table-column>
           <el-table-column label="出库人" align="center" prop="operator">
             <template #default="scope">
-              <span v-if="scope.row.outPut === 1">{{ scope.row.operator }}</span>
+              <span v-if="scope.row.outPut === '1'">{{ scope.row.operator }}</span>
               <span v-else></span>
             </template>
           </el-table-column>
           <el-table-column label="领用人" align="center" prop="shipper" />
           <el-table-column label="日期" align="center" prop="outPutTime" width="160">
             <template #default="scope">
-              <span v-if="scope.row.outPut === 1">{{ parseTime(scope.row.outPutTime, '{y}年{m}月{d}日') }}</span>
+              <span v-if="scope.row.outPut === '1'">{{ parseTime(scope.row.outPutTime, '{y}年{m}月{d}日') }}</span>
               <span v-else></span>
             </template>
           </el-table-column>