Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-19 9a4549c0c2dbe44c9568fe56fb4df8d6fbb44d4f

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

@@ -43,8 +43,10 @@
    private Long[] ruleIdsArray;

    @Excel(name = "规则")
    @TableField(exist = false)
    private String ruleName;

    @Excel(name = "扣减方式")
    private String deductCategory;

    @Excel(name = "指标")
    private String num;
@@ -82,7 +84,7 @@
    private Date updateTime;

    @TableLogic
    private String deleted;
    private Integer deleted;

    //查询条件
    @TableField(exist = false)