Merge branch 'bgy' of SH-Arbitrate/Arbitrate-Backend into dev

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

@@ -46,7 +46,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @GetMapping("/logistics")
-    @PreAuthorize("@ss.hasPermi('delivery:detail')")
+//    @PreAuthorize("@ss.hasPermi('delivery:detail')")
     public AjaxResult  getLogisticsInfo(CaseApplication caseApplication){
         List<LogisticsInfoVO> logisticsInfo = adjudicationService.getLogisticsInfo(caseApplication);
         return AjaxResult.success(logisticsInfo);

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

@@ -30,7 +30,7 @@ public class CaseApplicationController extends BaseController {
     /**
      * 查询立案数据
      */
-    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
     @GetMapping("/list")
     public TableDataInfo list(CaseApplication caseApplication) {
         startPage();

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

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
+                url: jdbc:mysql://121.40.189.20:3306/smart_arbitration?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
                 username: root
-                password: root123456
+                password: YMzc157#
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭