Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-01 82137fdbb4fc7d990b6f4d91f33ca80becad4545

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java

@@ -14,7 +14,7 @@

/**
 * 考核规则对象 t_check_rule
 * 
 *
 * @author ruoyi
 * @date 2024-04-15
 */
@@ -52,7 +52,7 @@

    /** 逻辑删除 */
    @Excel(name = "逻辑删除")
    private String deleted;
    private Integer deleted;

    /** 图标 */
    @Excel(name = "icon")