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

src/main/java/com/caimei365/user/model/dto/ShopUpdateDto.java

@@ -174,4 +174,22 @@ public class ShopUpdateDto implements Serializable {
      */
     @ApiModelProperty("税务登记证")
     private String taxLicense;
+
+    /**
+     * 公司网址
+     */
+    @ApiModelProperty("公司网址")
+    private String website;
+
+    /**
+     * 微信小程序
+     */
+    @ApiModelProperty("微信小程序")
+    private String wxApplets;
+
+    /**
+     * 微信公众号
+     */
+    @ApiModelProperty("微信公众号")
+    private String wxOfficialAccount;
 }

src/main/resources/mapper/ShopMapper.xml

@@ -77,6 +77,15 @@
             <if test="logo != null and logo != ''">
                 logo = #{logo},
             </if>
+            <if test="website != null and website != ''">
+                website = #{website},
+            </if>
+            <if test="wxApplets != null and wxApplets != ''">
+                wxApplets = #{wxApplets},
+            </if>
+            <if test="wxOfficialAccount != null and wxOfficialAccount != ''">
+                wxOfficialAccount = #{wxOfficialAccount},
+            </if>
             name = #{name}
         </set>
         where shopID = #{shopId}