Merge branch 'mp-20231016' of mangpiao/mp-server into mp-server-test

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

@@ -669,7 +669,7 @@ public class ChannelController extends BaseApiController {
         } catch (Exception e) {
             return AjaxResult.error("门店'" + channel.getName() + "'二维码更新失败");
         }
-        return AjaxResult.success(channel);
+        return AjaxResult.success(channel.getQrCodePic());
     }
 
     /**

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

@@ -82,7 +82,7 @@ public class UserChannelController extends BaseApiController {
         } catch (Exception e) {
             return AjaxResult.error("门店'" + channel.getName() + "'二维码更新失败");
         }
-        return AjaxResult.success(channel);
+        return AjaxResult.success(channel.getQrCodePic());
     }