活动审核

src/main/java/org/springblade/ldt/activity/entity/Activity.java

@@ -94,6 +94,26 @@ public class Activity extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "流程实例主键")
 		private String processInstanceId;
+	/**
+	* 父标签ids,逗号分割
+	*/
+		@ApiModelProperty(value = "父标签ids,逗号分割")
+		private String labelParentIds;
+	/**
+	* 商户标签json字符串
+	*/
+		@ApiModelProperty(value = "商户标签json字符串")
+		private String labelJson;
+	/**
+	* 商户标签key
+	*/
+		@ApiModelProperty(value = "商户标签key")
+		private String labelKey;
+	/**
+	* 商户标签value
+	*/
+		@ApiModelProperty(value = "商户标签value")
+		private String labelValue;
 
 
 }

src/main/java/org/springblade/ldt/activity/mapper/ActivityMapper.xml

@@ -23,6 +23,10 @@
         <result column="launch_type" property="launchType"/>
         <result column="process_definition_id" property="processDefinitionId"/>
         <result column="process_instance_id" property="processInstanceId"/>
+        <result column="label_parent_ids" property="labelParentIds"/>
+        <result column="label_json" property="labelJson"/>
+        <result column="label_key" property="labelKey"/>
+        <result column="label_value" property="labelValue"/>
     </resultMap>
 
 

src/main/resources/application.yml

@@ -116,7 +116,7 @@ flowable:
 
 #报表配置
 report:
-  enabled: false
+  enabled: true
   database:
     provider:
       prefix: blade-