Merge branch 'feature-2023-11-cloud' into 'developer'

渠道字典数据

See merge request !1555

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/DataController.java

@@ -114,6 +114,7 @@ public class DataController {
      * @return
      */
     @RequestMapping("list-channel-data")
+    @ResponseBody
     public RestResponse listChannelData(String enterpriseId) {
         Page<JSONObject> page = customSettingApiService
                 .page("tab_gic_channel_platform_dict", "", 1, 1000).getResult();