Merge branch 'release/3.0' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/common/config/MyTaskScheduler.java

src/main/java/com/ai/da/model/vo/PantoneVO.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
 
 @NoArgsConstructor
 @Data
@@ -43,4 +42,15 @@ public class PantoneVO {
         this.name = name;
         this.tcx = tcx;
     }
+
+    public PantoneVO(Integer r, Integer g, Integer b, Integer h, Integer s, Integer v) {
+        this.r = r;
+        this.g = g;
+        this.b = b;
+        this.h = h;
+        this.s = s;
+        this.v = v;
+        this.name = "--";
+        this.tcx = "--";
+    }
 }