From 7f56f78fbaa4569873bccc9a5169518d79412b94 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 14 十一月 2025 14:57:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/prod' into dev_tide_mom

---
 src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java |  111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 111 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
new file mode 100644
index 0000000..cc32e10
--- /dev/null
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
@@ -0,0 +1,111 @@
+package com.ruoyi.collaborativeApproval.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.approve.utils.ListToStringTypeHandler;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@TableName(value = "rules_regulations_management")
+public class RulesRegulationsManagement {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 鍒跺害缂栧彿
+     */
+    @ApiModelProperty("鍒跺害缂栧彿")
+    @Excel(name = "鍒跺害缂栧彿")
+    private String regulationNum;
+
+    /**
+     * 鏍囬
+     */
+    @ApiModelProperty("鏍囬")
+    @Excel(name = "鏍囬")
+    private String title;
+    /**
+     * 鍒跺害鍒嗙被
+     */
+    @ApiModelProperty("鍒跺害鍒嗙被")
+    @Excel(name = "鍒跺害鍒嗙被", readConverterExp = "finance=璐㈠姟鍒跺害,hr=浜轰簨鍒跺害,safety=瀹夊叏鍒跺害,tech=鎶�鏈埗搴�")
+    private String category;
+    /**
+     * 鍒跺害鍐呭
+     */
+    @ApiModelProperty("鍒跺害鍐呭")
+    private String content;
+    /**
+     * 鐢熸晥鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime effectiveTime;
+
+    /**
+     * 閫傜敤鑼冨洿
+     */
+    @ApiModelProperty("閫傜敤鑼冨洿")
+    @TableField(value = "scope",typeHandler = ListToStringTypeHandler.class,jdbcType = JdbcType.VARCHAR)
+    private List<String> scope;
+    /**
+     * 鏄惁闇�瑕佺‘璁�
+     */
+    @ApiModelProperty("鏄惁闇�瑕佺‘璁�")
+    private Boolean requireConfirm;
+    /**
+     * 鐗堟湰
+     */
+    @ApiModelProperty("鐗堟湰")
+    @Excel(name = "鐗堟湰")
+    private String version;
+    /**
+     * 鐘舵��
+     */
+    @ApiModelProperty("鐘舵��")
+    @Excel(name = "鐘舵��", readConverterExp = "repealed=宸插簾姝�,active=鐢熸晥涓�")
+    private String status;
+    /**
+     * 宸茶浜烘暟
+     */
+    @ApiModelProperty("宸茶浜烘暟")
+    @Excel(name = "宸茶浜烘暟")
+    private Integer readCount;
+    /**
+     * 鍒涘缓鑰�
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+    /**
+     * 淇敼浜�
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+    /**
+     * 淇敼鏃堕棿
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+    /**
+     * 绉熸埛ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long tenantId;
+}

--
Gitblit v1.9.3