Browse Source

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 years ago
parent
commit
ec7f890347

+ 3 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoCollectController.java

@@ -167,6 +167,9 @@ public class ObjectInfoCollectController {
             if(vo.getValid() == null){
                 vo.setValid(1);
             }
+            if(vo.getKeyWord() == null){
+                vo.setKeyWord(false);
+            }
         }
     }
 

+ 1 - 0
dmp-business/dmp-rwd/src/main/resources/db/init/schema.sql

@@ -229,5 +229,6 @@ CREATE TABLE IF NOT EXISTS `dt_define_info_collect`  (
 `modified_time` char(14) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '最后修改时间',
 `valid` tinyint NULL DEFAULT NULL COMMENT '合法标识',
 `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
+`key_word` int(1) DEFAULT NULL COMMENT '是否为关键信息点',
 PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;

+ 3 - 0
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/define/entity/ObjectInfoCollect.java

@@ -30,4 +30,7 @@ public class ObjectInfoCollect extends AuditableEntity {
     /** 是否可见 true -可见 false-不可见 */
     private Boolean visiable;
 
+    /** 是否为关键信息点  */
+    private Boolean keyWord;
+
 }