Merge branch 'dev' into test

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -23,13 +23,9 @@ liquidnet:
   knife4j:
     disable: false
   redis:
-    host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
-    #    host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com
+    host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
     port: 6380
     password: PO@B!Iud32
-#    host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
-#    port: 6380
-#    password: PO@B!Iud32
   mongodb:
     host: s-2zef656730e5a1d4-pub.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14-pub.mongodb.rds.aliyuncs.com:3717
     port: 3717

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml

@@ -57,7 +57,7 @@ info:
     version: '@project.version@'
 # -----------------------------------------------------------
 mybatis-plus:
-  mapper-locations: classpath:com.liquidnet.service.*.mapper/*Mapper.xml
+  mapper-locations: classpath:com.liquidnet.service.*.mapper/*Mapper.xml,classpath:com.liquidnet.service.kylin.mapper/*Mapper.xml
 # -----------------------------------------------------------
 spring:
   application:
@@ -142,4 +142,4 @@ global-auth:
 
 # -----------------------------------------------------------
 
-# -----------------------------------------------------------
+# -----------------------------------------------------------
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/express/shunfeng/PerformancesExpressCallbackController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2021-06-29
  */
 
-@Api(tags = "前端-shunfengBack")
+@Api(tags = "前端-shunfengCallBack")
 @RestController
 @RequestMapping("performancesExpress")
 public class PerformancesExpressCallbackController {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/refund/OrderRefundCallbackController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author jiangxiulong
  * @since 2021-06-11 6:10 下午
  */
-@Api(tags = "前端-退款回调")
+@Api(tags = "前端-refundCallBack")
 @RestController
 @RequestMapping("refund")
 public class OrderRefundCallbackController {