Merge branch 'feature-canvas' into 'developer'

Feature canvas

See merge request !2391

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

@@ -133,6 +133,10 @@ public class CanvasDataController {
             }
         }
 
+
+        //区经，设置了门店ID参数后，取出clerkId
+        jsonObject.remove("clerkId");
+
         Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_mkt_canvas_haoban_mkt_task");
         Page<CanvasTaskVO> page = DataApiUtils.getPageData(res, CanvasTaskVO.class);
         List<CanvasTaskVO> list = page.getResult();