From 24b28c40758e03e9ef372502fa29d9072b7c909b Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 16 九月 2022 15:43:39 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
index 1f678ee..1788346 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
@@ -16,8 +16,8 @@
 @SuppressWarnings("serial")
 @TableName("target_mng")
 public class TargetMng extends BaseDomain {
-	
-	
+
+
     @TableId(type = IdType.AUTO)
     private Long id;
     public Long getId() {
@@ -41,7 +41,7 @@
 
     //目标指标编号
             private String indexNum;
-        
+
     public String getIndexNum() {
         return indexNum;
     }
@@ -51,7 +51,7 @@
     }
                 //年度
             private String year;
-        
+
     public String getYear() {
         return year;
     }
@@ -61,7 +61,7 @@
     }
                 //指标值
             private String value;
-        
+
     public String getValue() {
         return value;
     }
@@ -71,7 +71,7 @@
     }
                 //1:大于 2:等于 3:小于
             private Integer valueSign;
-        
+
     public Integer getValueSign() {
         return valueSign;
     }
@@ -80,19 +80,19 @@
         this.valueSign = valueSign;
     }
                 //指标级别 1:公司级 2:部门分厂级 3:工段班组级
-            private Integer level;
-        
-    public Integer getLevel() {
+            private Byte level;
+
+    public Byte getLevel() {
         return level;
     }
 
-    public void setLevel(Integer level) {
+    public void setLevel(Byte level) {
         this.level = level;
     }
                 //完成期限
             @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
         private Timestamp completeDate;
-        
+
     public Timestamp getCompleteDate() {
         return completeDate;
     }
@@ -102,7 +102,7 @@
     }
                 //备注信息
             private String memo;
-        
+
     public String getMemo() {
         return memo;
     }
@@ -112,7 +112,7 @@
     }
                 //指标类型 1:年指标 2:月指标 3:半年 4:季度
             private Integer targetType;
-        
+
     public Integer getTargetType() {
         return targetType;
     }
@@ -122,7 +122,7 @@
     }
                 //分解状态 1:已分解 2:未分解
             private Integer divideStatus;
-        
+
     public Integer getDivideStatus() {
         return divideStatus;
     }
@@ -132,7 +132,7 @@
     }
                         //目标制定部门
             private Long makerDepartmentId;
-        
+
     public Long getMakerDepartmentId() {
         return makerDepartmentId;
     }
@@ -142,7 +142,7 @@
     }
                 //是否删除 0:未删除 1:删除
             private Integer delFlag;
-        
+
     public Integer getDelFlag() {
         return delFlag;
     }
@@ -150,5 +150,5 @@
     public void setDelFlag(Integer delFlag) {
         this.delFlag = delFlag;
     }
-    
-}
\ No newline at end of file
+
+}

--
Gitblit v1.9.2