活动管理

platform-admin/src/main/java/com/platform/entity/TbCfExpressTemplateEntity.java

@@ -83,6 +83,16 @@ public class TbCfExpressTemplateEntity implements Serializable {
      */
     private Date updateTime;
 
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
     /**
      * 设置：模板id
      */

platform-admin/src/main/resources/com/platform/dao/TbCfExpressTemplateDao.xml

@@ -21,6 +21,7 @@
         <result property="postageFreePrice" column="postage_free_price"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="desc" column="desc"/>
     </resultMap>
 
     <select id="queryObject" resultType="com.platform.entity.TbCfExpressTemplateEntity">
@@ -41,7 +42,8 @@
 			`is_default`,
 			`postage_free_price`,
 			`create_time`,
-			`update_time`
+			`update_time`,
+			`desc`
 		from tb_cf_express_template
 		where template_id = #{id}
 	</select>
@@ -66,7 +68,8 @@
         `is_default`,
         `postage_free_price`,
         t.`create_time`,
-        t.`update_time`
+        t.`update_time`,
+        `desc`
         from tb_cf_express_template t
         inner join country c
         on t.country=c.id
@@ -113,7 +116,8 @@
 			`is_default`,
 			`postage_free_price`,
 			`create_time`,
-			`update_time`)
+			`update_time`,
+			`desc`)
 		values(
 			#{templateId},
 			#{templateTitle},
@@ -131,7 +135,8 @@
 			#{isDefault},
 			#{postageFreePrice},
 			#{createTime},
-			#{updateTime})
+			#{updateTime},
+			#{desc})
 	</insert>
 
     <update id="update" parameterType="com.platform.entity.TbCfExpressTemplateEntity">
@@ -152,7 +157,8 @@
             <if test="isDefault != null">`is_default` = #{isDefault},</if>
             <if test="postageFreePrice != null">`postage_free_price` = #{postageFreePrice},</if>
             <if test="createTime != null">`create_time` = #{createTime},</if>
-            <if test="updateTime != null">`update_time` = #{updateTime}</if>
+            <if test="updateTime != null">`update_time` = #{updateTime},</if>
+            <if test="desc != null">`update_time` = #{desc}</if>
         </set>
         where template_id = #{templateId}
     </update>

platform-admin/src/main/resources/dev/platform.properties

@@ -6,7 +6,7 @@
 #jdbc.username=root
 #jdbc.password=diaoyun666
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica_ref?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.url: jdbc:mysql://159.138.48.71:3306/test?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
 jdbc.username: root
 jdbc.password: Diaoyunnuli.8
 

platform-admin/src/main/resources/prod/platform.properties

@@ -6,7 +6,7 @@
 #jdbc.username=root
 #jdbc.password=diaoyun666
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica_ref?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.url: jdbc:mysql://159.138.48.71:3306/test?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
 jdbc.username: root
 jdbc.password: Diaoyunnuli.8