Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.wisdomarbitrate;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+import com.ruoyi.wisdomarbitrate.domain.vo.BookSendVO;
 import com.ruoyi.wisdomarbitrate.service.IAdjudicationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -71,17 +72,12 @@ public class AdjudicationController extends BaseController {
 
     /**
      * 送达(不包含发送电子邮件)
-     * @param id
-     * @param appEmail
-     * @param resEmail
-     * @param apptrackingNum
-     * @param restrackingNum
+     * @param bookSendVO
      * @return
      */
     @PostMapping("/service")
-    public AjaxResult service(Long id,String appEmail,String resEmail
-            ,String apptrackingNum,String restrackingNum){
-        return adjudicationService.service(id,appEmail,resEmail,apptrackingNum,restrackingNum);
+    public AjaxResult service(@RequestBody BookSendVO bookSendVO){
+        return adjudicationService.service(bookSendVO.getId(),bookSendVO.getAppEmail(),bookSendVO.getResEmail(),bookSendVO.getApptrackingNum(),bookSendVO.getRestrackingNum());
     }
     /**
      * 用印(暂时只改案件状态)

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false
+                url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
                 username: root
                 password: root123456
             # 从库数据源