Merge branch 'feature-canvas' into 'developer'

Feature canvas

See merge request !2387

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/canvas/CanvasConversionDataVO.java

@@ -13,7 +13,12 @@ public class CanvasConversionDataVO implements Serializable {
     private Integer convsCsmeIntglCnt;
 
     /**
-     * 转化人数/积分消耗人数
+     * 积分消耗人数
+     */
+    private Integer csmeIntglMbrNum;
+
+    /**
+     * 转化人数
      */
     private Integer convsMbrNum;