Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-13 d8acd9f9cfc75571fefb8240bebca1fe9f5c802b

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java

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

@@ -42,5 +42,7 @@
    @TableField("face_chceckpoint_num")
    private Integer faceChceckpointNum;


    @ApiModelProperty("运维类别")
    @TableField("category")
    private Integer category;
}

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java

@@ -36,6 +36,8 @@
    /** 人脸卡口点位数 */
    private Integer faceChceckpointNum;

    private Integer category;

    public static CheckRuleVO getVoByEntity(@NonNull CheckRule entity, CheckRuleVO vo) {
        if(vo == null) {
            vo = new CheckRuleVO();