Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageTemplateDTO.java

@@ -48,7 +48,7 @@ public class HmPageTemplateDTO extends WebLoginDTO {
     /**
      * 页面背景图
      */
-    private String pageBackgroudImg;
+    private String pageBackgroundImg;
 
     /**
      * 引导语
@@ -111,12 +111,12 @@ public class HmPageTemplateDTO extends WebLoginDTO {
         this.merchantLogo = merchantLogo;
     }
 
-    public String getPageBackgroudImg() {
-        return pageBackgroudImg;
+    public String getPageBackgroundImg() {
+        return pageBackgroundImg;
     }
 
-    public void setPageBackgroudImg(String pageBackgroudImg) {
-        this.pageBackgroudImg = pageBackgroudImg;
+    public void setPageBackgroundImg(String pageBackgroundImg) {
+        this.pageBackgroundImg = pageBackgroundImg;
     }
 
     public String getGuideComment() {

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmPageMapper.xml

@@ -12,7 +12,7 @@
         <result column="merchant_name" property="merchantName" jdbcType="VARCHAR"/>
         <result column="merchant_phone_number" property="merchantPhoneNumber" jdbcType="VARCHAR"/>
         <result column="merchant_logo" property="merchantLogo" jdbcType="VARCHAR"/>
-        <result column="page_backgroud_img" property="pageBackgroundImg" jdbcType="VARCHAR"/>
+        <result column="page_background_img" property="pageBackgroundImg" jdbcType="VARCHAR"/>
         <result column="guide_comment" property="guideComment" jdbcType="VARCHAR"/>
         <result column="createor_id" property="createorId" jdbcType="VARCHAR"/>
         <result column="createor_name" property="createorName" jdbcType="VARCHAR"/>
@@ -24,7 +24,7 @@
     <sql id="Base_Column_List">
         page_id
         , page_code, page_name, enterprise_id, wx_enterprise_id, status,
-    page_title, merchant_name, merchant_phone_number, merchant_logo, page_backgroud_img, 
+    page_title, merchant_name, merchant_phone_number, merchant_logo, page_background_img, 
     guide_comment, createor_id, createor_name, modifier_id, modifier_name, create_time, 
     update_time
     </sql>
@@ -43,7 +43,7 @@
         insert into tab_haoban_hm_page (page_id, page_code, page_name,
                                         enterprise_id, wx_enterprise_id, status,
                                         page_title, merchant_name, merchant_phone_number,
-                                        merchant_logo, page_backgroud_img, guide_comment,
+                                        merchant_logo, page_background_img, guide_comment,
                                         createor_id, createor_name, modifier_id,
                                         modifier_name, create_time, update_time)
         values (#{pageId,jdbcType=BIGINT}, #{pageCode,jdbcType=CHAR}, #{pageName,jdbcType=VARCHAR},
@@ -89,7 +89,7 @@
                 merchant_logo,
             </if>
             <if test="pageBackgroundImg != null">
-                page_backgroud_img,
+                page_background_img,
             </if>
             <if test="guideComment != null">
                 guide_comment,
@@ -201,7 +201,7 @@
                 merchant_logo = #{merchantLogo,jdbcType=VARCHAR},
             </if>
             <if test="pageBackgroundImg != null">
-                page_backgroud_img = #{pageBackgroundImg,jdbcType=VARCHAR},
+                page_background_img = #{pageBackgroundImg,jdbcType=VARCHAR},
             </if>
             <if test="guideComment != null">
                 guide_comment = #{guideComment,jdbcType=VARCHAR},
@@ -238,7 +238,7 @@
             merchant_name         = #{merchantName,jdbcType=VARCHAR},
             merchant_phone_number = #{merchantPhoneNumber,jdbcType=VARCHAR},
             merchant_logo         = #{merchantLogo,jdbcType=VARCHAR},
-            page_backgroud_img    = #{pageBackgroundImg,jdbcType=VARCHAR},
+            page_background_img    = #{pageBackgroundImg,jdbcType=VARCHAR},
             guide_comment         = #{guideComment,jdbcType=VARCHAR},
             createor_id           = #{createorId,jdbcType=VARCHAR},
             createor_name         = #{createorName,jdbcType=VARCHAR},

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmPageTemplateController.java

@@ -42,7 +42,7 @@ public class HmPageTemplateController {
         pageTemplateDTO.setMerchantName(pageTemplateSettingVO.getMerchantName());
         pageTemplateDTO.setMerchantPhoneNumber(pageTemplateSettingVO.getMerchantPhoneNumber());
         pageTemplateDTO.setMerchantLogo(pageTemplateSettingVO.getMerchantLogo());
-        pageTemplateDTO.setPageBackgroudImg(pageTemplateSettingVO.getPageBackgroundImg());
+        pageTemplateDTO.setPageBackgroundImg(pageTemplateSettingVO.getPageBackgroundImg());
         pageTemplateDTO.setGuideComment(pageTemplateSettingVO.getGuideComment());
         pageTemplateDTO.setClerkId(loginUser.getClerkId());
         pageTemplateDTO.setClerkName(loginUser.getClerkName());
@@ -66,7 +66,7 @@ public class HmPageTemplateController {
         pageTemplateDTO.setMerchantName(pageTemplateSettingVO.getMerchantName());
         pageTemplateDTO.setMerchantPhoneNumber(pageTemplateSettingVO.getMerchantPhoneNumber());
         pageTemplateDTO.setMerchantLogo(pageTemplateSettingVO.getMerchantLogo());
-        pageTemplateDTO.setPageBackgroudImg(pageTemplateSettingVO.getPageBackgroundImg());
+        pageTemplateDTO.setPageBackgroundImg(pageTemplateSettingVO.getPageBackgroundImg());
         pageTemplateDTO.setGuideComment(pageTemplateSettingVO.getGuideComment());
         pageTemplateDTO.setClerkId(loginUser.getClerkId());
         pageTemplateDTO.setClerkName(loginUser.getClerkName());