Merge branch 'feature-canvas' into 'developer'

画布

See merge request !2392

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ContentMaterialDTO.java

@@ -29,6 +29,20 @@ public class ContentMaterialDTO implements Serializable {
 
     private String materialDesc;
 
+    /**
+     * 画布-群发-卡券素材ID
+     */
+    private String canvasCouponUUID ;
+
+
+    public String getCanvasCouponUUID() {
+        return canvasCouponUUID;
+    }
+
+    public void setCanvasCouponUUID(String canvasCouponUUID) {
+        this.canvasCouponUUID = canvasCouponUUID;
+    }
+
     public String getMaterialDesc() {
         return materialDesc;
     }