目标合并fix

songhuangfeng123

2022-08-11 d674b4d350236301d0e31929661d53796e0e89df

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/RewardPunishmentDetailDto.java

@@ -72,6 +72,17 @@
        this.id = id;
    }

    //备注信息
    private String memo;

    public String getMemo() {
        return memo;
    }

    public void setMemo(String memo) {
        this.memo = memo;
    }

    public Long getRewardPunishmentStandardId() {
        return rewardPunishmentStandardId;
    }
@@ -107,4 +118,8 @@
    public void setRewardPunishmentStandardName(String rewardPunishmentStandardName) {
        this.rewardPunishmentStandardName = rewardPunishmentStandardName;
    }

    public String getRewardPunishmentStandardName() {
        return rewardPunishmentStandardName;
    }
}