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

src/main/java/com/zzsn/event/entity/Subject.java

@@ -109,7 +109,8 @@ public class Subject implements Serializable {
     private Date firstOpenTime;
     /**预估状态*/
     private String estimateStatus;
-
+    /** 环境 1-测试 2-正式 */
+    private String environment;
     /**专题分类id*/
     @TableField(exist = false)
     private String typeId;

src/main/java/com/zzsn/event/mapper/xml/SubjectMapper.xml

@@ -160,6 +160,7 @@
         <result column="library" property="library"/>
         <result column="face_public" property="facePublic"/>
         <result column="first_open_time" property="firstOpenTime"/>
+        <result column="estimate_status" property="estimateStatus"/>
         <collection property="sampleFileList" ofType="com.zzsn.event.entity.SubjectSampleFile">
             <id column="id" property="id"/>
             <result column="file_name" property="fileName"/>

src/main/java/com/zzsn/event/vo/SubjectPage.java

@@ -181,5 +181,6 @@ public class SubjectPage {
 
 
     private List<ClbModelArrange> clbModelArranges;
-
+    /** 环境 1-测试 2-正式 */
+    private String environment;
 }

src/main/java/com/zzsn/event/vo/SubjectSimpleVO.java

@@ -36,4 +36,6 @@ public class SubjectSimpleVO {
     private Integer facePublic;
     /**关键词*/
     private List<SearchWordVO> keywords;
+    /** 环境 1-测试 2-正式 */
+    private String environment;
 }