change 4 anni fa
parent
commit
4c1d6c4987

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationAddBo.java

@@ -82,6 +82,11 @@ public class ActivityConfigurationAddBo {
     @ApiModelProperty("活动地址")
     private String activityUrl;
 
+    /** 活动详情 */
+    @Excel(name = "活动详情")
+    @ApiModelProperty("活动详情")
+    private String activityContentUrl;
+
     /** 绑定课程 */
     @Excel(name = "绑定课程")
     @ApiModelProperty("绑定课程")

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationEditBo.java

@@ -83,6 +83,11 @@ public class ActivityConfigurationEditBo {
     @ApiModelProperty("活动图标")
     private String activityLogo;
 
+    /** 活动详情 */
+    @Excel(name = "活动详情")
+    @ApiModelProperty("活动详情")
+    private String activityContentUrl;
+
 
 
     /** 活动地址 */

+ 4 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationQueryBo.java

@@ -90,7 +90,10 @@ public class ActivityConfigurationQueryBo extends BaseEntity {
 	@ApiModelProperty("活动图标")
 	private String activityLogo;
 
-
+	/** 活动详情 */
+	@Excel(name = "活动详情")
+	@ApiModelProperty("活动详情")
+	private String activityContentUrl;
 
 	/** 活动地址 */
 	@Excel(name = "活动地址")

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfiguration.java

@@ -79,4 +79,7 @@ private static final long serialVersionUID=1L;
     /** 活动地址 */
     private String activityUrl;
 
+    /** 活动详情 */
+    private String activityContentUrl;
+
 }

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationVo.java

@@ -105,6 +105,11 @@ public class ActivityConfigurationVo {
 	@ApiModelProperty("活动地址")
 	private String activityUrl;
 
+	/** 活动详情 */
+	@Excel(name = "活动详情")
+	@ApiModelProperty("活动详情")
+	private String activityContentUrl;
+
 
 	/** 绑定课程 */
 	@Excel(name = "绑定课程")

+ 7 - 0
zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="activityName" column="activity_name"/>
         <result property="activityType" column="activity_type"/>
         <result property="description" column="description"/>
+        <result property="activityContentUrl" column="activity_content_url"/>
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
         <result property="price" column="price"/>
@@ -27,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="activityName" column="activity_name"/>
         <result property="activityType" column="activity_type"/>
         <result property="description" column="description"/>
+        <result property="activityContentUrl" column="activity_content_url"/>
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
         <result property="price" column="price"/>
@@ -63,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="activityType" column="sactivity_type"/>
         <result property="description" column="sdescription"/>
         <result property="startTime" column="sstart_time"/>
+        <result property="activityContentUrl" column="sactivity_content_url"/>
         <result property="endTime" column="send_time"/>
         <result property="price" column="sprice"/>
         <result property="quantity" column="squantity"/>
@@ -169,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         c.description as sdescription,
         c.start_time as sstart_time,
         c.end_time as send_time,
+        c.activity_content_url as sactivity_content_url,
         c.price as sprice,
         c.quantity as squantity,
         c.live_content as slive_content,
@@ -235,13 +239,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         c.description,
         c.start_time ,
         c.end_time ,
+        c.activity_content_url ,
         c.price ,
         c.quantity ,
+        c.activity_logo ,
         c.live_content ,
         c.live_adress,
         c.create_time,
         c.update_time,
         c.status  ,
+        c.activity_url,
         c.coupon_end
         FROM
         activity_configuration c