Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java

@@ -557,10 +557,8 @@ public class AppEnforcementRegistrationController extends BaseController {
 
         //bo.setLawEnforcementId(LoginHelper.getDeptId());
         //根据用户ID查询用户执法证件号码
-        SysUserVo user = sysUserService.selectUserById( LoginHelper.getUserId());
-        if (user != null){
-            bo.setUserId(user.getLawCertificateNum());
-        }
+        //SysUserVo user = sysUserService.selectUserById( LoginHelper.getUserId());
+        bo.setUserId(LoginHelper.getUserId().toString());
         // 使用标准的分页查询方法
         TableDataInfo<EnforcementRegistrationVo> pageResult = DataPermissionHelper.ignore(() ->
             enforcementRegistrationService.queryPageListInfo(bo, pageQuery)

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseLawEnforcement.java

@@ -16,9 +16,8 @@ import java.io.Serial;
  * @date 2026-04-13
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("enterprise_law_enforcement")
-public class EnterpriseLawEnforcement extends BaseEntity {
+public class EnterpriseLawEnforcement {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -50,7 +49,7 @@ public class EnterpriseLawEnforcement extends BaseEntity {
     private String enterpriseName;
 
     /**
-     * 
+     *
      */
     private Date checkTime;
 
@@ -70,12 +69,12 @@ public class EnterpriseLawEnforcement extends BaseEntity {
     private String remark;
 
     /**
-     * 
+     *
      */
     private String userId;
 
     /**
-     * 
+     *
      */
     private String deptId;
 
@@ -135,52 +134,52 @@ public class EnterpriseLawEnforcement extends BaseEntity {
     private Long isSubmit;
 
     /**
-     * 
+     *
      */
     private String uniteCheck;
 
     /**
-     * 
+     *
      */
     private Long isUnite;
 
     /**
-     * 
+     *
      */
     private Long isReg;
 
     /**
-     * 
+     *
      */
     private Long mainDeputyOrder;
 
     /**
-     * 
+     *
      */
     private String tmpDeptJson;
 
     /**
-     * 
+     *
      */
     private String checkItemText;
 
     /**
-     * 
+     *
      */
     private String checkRequireText;
 
     /**
-     * 
+     *
      */
     private String bureauDeptId;
 
     /**
-     * 
+     *
      */
     private String bureauDeptName;
 
     /**
-     * 
+     *
      */
     private Long checkTimeOrder;
 
@@ -194,5 +193,9 @@ public class EnterpriseLawEnforcement extends BaseEntity {
      */
     private String checkHourEnd;
 
+    private String createBy;
+
+    private Date updateTime;
+
 
 }