Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-20 9f122a41255d18f04a82d8be3b038a95c2c18d95

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/RewardPunishmentStandardQueryCriteria.java

@@ -8,6 +8,16 @@
    //奖惩类型 1:奖励 2:惩罚
    @Query()
    private Integer standardType;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    //奖惩类型 1:奖励 2:惩罚
    public Integer getStandardType() {
        return standardType;