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

songhuangfeng123

2022-09-02 fabd08d87d00bfdf1aacf473fd905fdd3c903ed3

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

@@ -34,13 +34,13 @@
    private Timestamp updateTime;

    //目标指标分解列表
    private List<TargetDivideDetail> targetDivideDetailList = new ArrayList<>();
    private List<TargetDivideDetailDto> targetDivideDetailList = new ArrayList<>();

    public List<TargetDivideDetail> getTargetDivideDetailList() {
    public List<TargetDivideDetailDto> getTargetDivideDetailList() {
        return targetDivideDetailList;
    }

    public void setTargetDivideDetailList(List<TargetDivideDetail> targetDivideDetailList) {
    public void setTargetDivideDetailList(List<TargetDivideDetailDto> targetDivideDetailList) {
        this.targetDivideDetailList = targetDivideDetailList;
    }

@@ -140,4 +140,38 @@
    public void setUpdateTime(Timestamp updateTime) {
        this.updateTime = updateTime;
    }

    //目标制定部门
    private Long makerDepartmentId;

    public Long getMakerDepartmentId() {
        return makerDepartmentId;
    }

    public void setMakerDepartmentId(Long makerDepartmentId) {
        this.makerDepartmentId = makerDepartmentId;
    }


    //目标制定部门名称
    private String makerDepartmentName;

    public String getMakerDepartmentName() {
        return makerDepartmentName;
    }

    public void setMakerDepartmentName(String makerDepartmentName) {
        this.makerDepartmentName = makerDepartmentName;
    }

    //1:大于 2：等于 3：小于
    private Integer valueSign;

    public Integer getValueSign() {
        return valueSign;
    }

    public void setValueSign(Integer valueSign) {
        this.valueSign = valueSign;
    }
}