Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!791

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/SaleSiteMgrController.java

@@ -334,7 +334,7 @@ public class SaleSiteMgrController extends BaseApiController {
 		}
 
 		boolean rtn = channelService.update(new LambdaUpdateWrapper<Channel>()
-			.set(Channel::getSiteName, saleSiteEditParam.getSiteName())
+			.set(Channel::getName, saleSiteEditParam.getName())
 			.eq(Channel::getChannelId, saleSiteEditParam.getChannelId()));
 
 		if (!rtn) {

mp-service/src/main/java/com/qs/mp/channel/domain/param/SaleSiteEditParam.java

@@ -22,6 +22,6 @@ public class SaleSiteEditParam {
 
     @NotBlank(message = "门店名称不能为空")
     @ApiModelProperty("门店名称")
-    private String siteName;
+    private String name;
 
 }