1

src/main/java/com/yunzhi/marketing/entity/TaBuilding.java

@@ -372,6 +372,9 @@ public class TaBuilding implements Serializable {
      */
     private String marketingCode;
 
+    /** 是否文旅商办 */
+    private Integer isCommerce ;
+
     /**
      * 项目亮点封面
      */

src/main/java/com/yunzhi/marketing/entity/TaBuildingDynamic.java

@@ -232,5 +232,13 @@ public class TaBuildingDynamic implements Serializable {
     @TableField(exist = false)
     private Integer enlisted;
 
+    /**
+     * dymic 普通活动 house 团房活动
+     */
     private String type;
+
+    /**
+     * 副标题
+     */
+    private String halfTitle;
 }

src/main/java/com/yunzhi/marketing/po/LiveAndVideoVO.java

@@ -7,6 +7,8 @@ import java.time.LocalDate;
 @Data
 public class LiveAndVideoVO {
 
+    private String id;
+
     private String title;
 
     private LocalDate startTime;

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -73,6 +73,7 @@
 
     <select id="getWxLiveActivityAndVideo" resultType="com.yunzhi.marketing.po.LiveAndVideoVO">
         SELECT
+            t.live_activity_id as id,
             t.live_activity_title AS title,
             t.live_start_date AS start_time,
             t.live_end_date AS end_time,
@@ -91,6 +92,7 @@
         </if>
     UNION
         SELECT
+            t.video_id as id,
             t.NAME AS title,
             t.CREATED_TIME AS startTime,
             t.CREATED_TIME AS endTime,