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

songhuangfeng123

2022-09-16 24b28c40758e03e9ef372502fa29d9072b7c909b

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

@@ -19,7 +19,7 @@
    //指标值    
    private String value;
    //指标级别 1:公司级 2:部门分厂级 3:工段班组级    
    private Integer level;
    private Byte level;
    //完成期限    
    private Timestamp completeDate;
    //备注信息    
@@ -85,11 +85,11 @@
        this.value = value;
    }
    //指标级别 1:公司级 2:部门分厂级 3:工段班组级        
    public Integer getLevel() {
    public Byte getLevel() {
        return level;
    }

    public void setLevel(Integer level) {
    public void setLevel(Byte level) {
        this.level = level;
    }
    //完成期限