From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:17:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java
index 23aaa05..7d4c231 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java
@@ -38,6 +38,7 @@
     /**
      * 图片地址 多个用逗号隔开
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String photoPah;
 
     /**
@@ -89,7 +90,7 @@
     /**
      * 单张图片高度
      */
-    private Integer imgHeight;
+    private BigDecimal imgHeight;
 
     /**
      * 开始时间
@@ -157,6 +158,11 @@
     private Long publishBy;
 
     /**
+     * 议事内容类型(1.社区议事 2.院落议事 3.党群议事)
+     */
+    private Integer contentType;
+
+    /**
      * 类型 1 议事 2 投票
      */
     public interface type{

--
Gitblit v1.7.1