Merge remote-tracking branch 'origin/dev_price' into 20231126-yw

2 years ago · ba23b3e90e
parent b382a19fc4 6d0090c058
commit ba23b3e90e
2 changed files with 2 additions and 2 deletions
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java
@ -28,7 +28,7 @@ public class ThrProductTypeCotroller {
    ThrProductTypeService thrProductTypeService;

    @AuthRuleAnnotation("")
-    @GetMapping("/udiwms/thrsys/getHslbs")
+    @GetMapping("/udiwms/thrsys/getThrProductType")
    public BaseResponse getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest,
                                        BindingResult bindingResult) {

--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@ -15,7 +15,7 @@ spring:

  redis:
    database: 8
-    host: 127.0.0.1
+    host: 127.0.0.19991
    port: 6379
    #    password: 123456
    timeout: 300