Merge remote-tracking branch 'origin/v0.2' into v0.2

# Conflicts:
#	application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/TourismProjectToWebController.java

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/TourismProjectToWebController.java

@@ -1,7 +1,6 @@
 package com.tourism.webadmin.app.website.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
-import com.tourism.common.core.annotation.MyRequestBody;
 import com.tourism.common.core.constant.ErrorCodeEnum;
 import com.tourism.common.core.object.*;
 import com.tourism.webadmin.app.website.dto.TourismBookProjectDto;
@@ -89,8 +88,8 @@ public class TourismProjectToWebController {
     * @return 应答结果对象，包含对象详情。
     */
     @PostMapping("/bookProject")
-    public ResponseResult<Void> bookProject(HttpServletRequest request,@MyRequestBody TourismBookProjectDto tourismBookProjectDto) {
-        tourismProjectToWebService.bookProject(request,tourismBookProjectDto);
+    public ResponseResult<Void> bookProject(HttpServletRequest request,@MyRequestBody TourismBookProjectDto tourBookInfoDto) {
+        tourismProjectToWebService.bookProject(request,tourBookInfoDto);
         return ResponseResult.success();
     }
 

application-webadmin/src/main/java/com/tourism/webadmin/app/website/dto/TourismBookProjectDto.java

@@ -1,5 +1,6 @@
 package com.tourism.webadmin.app.website.dto;
 
+import com.tourism.common.core.validator.UpdateGroup;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -8,16 +9,17 @@ import java.util.Date;
 @Data
 public class TourismBookProjectDto {
 
-    @NotNull
+    @NotNull(message = "type不能为空！")
     private Integer type;
 
-    @NotNull
+    @NotNull(message = "项目不能为空！")
     private Long projectId;
 
+    @NotNull(message = "成人数量不能为空！")
     private Integer adultNumber;
 
     private Integer childrenNumber;
 
-    @NotNull
+    @NotNull(message = "预定日期不能为空！")
     private Date startDate;
 }

application-webadmin/src/main/resources/application-test.yml

@@ -10,27 +10,27 @@ spring:
       main:
         url: jdbc:mysql://101.126.146.250:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
-        password: xyy1q2w!
+        password: XYY1q2w!
       # 默认生成的操作日志数据源配置。
       operation-log:
         url: jdbc:mysql://101.126.146.250:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
-        password: xyy1q2w!
+        password: XYY1q2w!
       # 默认生成的全局编码字典数据源配置。
       global-dict:
         url: jdbc:mysql://101.126.146.250:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
-        password: xyy1q2w!
+        password: XYY1q2w!
       # 默认生成的工作流及在线表单数据源配置。
       common-flow-online:
         url: jdbc:mysql://101.126.146.250:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
-        password: xyy1q2w!
+        password: XYY1q2w!
       # 默认生成的统计打印模块的数据源配置。
       common-report:
         url: jdbc:mysql://101.126.146.250:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
-        password: xyy1q2w!
+        password: XYY1q2w!
       driverClassName: com.mysql.cj.jdbc.Driver
       name: application-webadmin
       initialSize: 10