Merge remote-tracking branch 'origin/feature-v2.0.0-20230505-dsx' into feature-v2.0.0-20230505-dsx

src/main/java/com/fdkankan/openApi/controller/www/SceneMarkShapeController.java

@@ -50,7 +50,7 @@ public class SceneMarkShapeController extends BaseController
     @PostMapping("/saveOrEdit")
     @RedisLimit(limitCount = 100, period = 1)
     @ValidateApi(method = "scene:saveOrEdit")
-    public ResultData saveOrEdit(@RequestBody SceneMarkShapeVO param) {
+    public ResultData saveOrEdit(@RequestBody  @Validated  SceneMarkShapeVO param) {
         this.checkScene(param.getNum());
         return sceneMarkShapeService.saveOrEdit(param);
     }

src/main/java/com/fdkankan/openApi/vo/www/SceneMarkShapeVO.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
@@ -27,7 +28,7 @@ public class SceneMarkShapeVO   {
       @NotNull(message = "版本号不能为空")
       private String version;
 
-      @NotNull(message = "标注数据不能为空")
+      @NotEmpty(message = "标注数据不能为空")
       private List<JSONObject> shapes;
 
       @NotBlank(message = "场景路径图片名称不能为空")