Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-30 628b80d0452602c5c02cec9ddbbee266f89d60c8

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

@@ -35,7 +35,8 @@
    /** deptid */
    @Excel(name = "区县")
    private Long deptId;

    @TableField(exist = false)
    private String deptName;
    /** 考核模板id */
    @Excel(name = "考核模板id")
    private Integer templateId;