Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mjava-ts/src/main/resources/application-dev.yml
#	mjava-ts/src/main/resources/application-prod.yml

mjava-ts/pom.xml

@@ -59,7 +59,10 @@
             <artifactId>mybatis-plus-core</artifactId>
             <version>3.5.7</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

mjava-ts/src/main/java/com/malk/taisen/controller/ProxyController.java

@@ -18,8 +18,8 @@ public class  ProxyController {
      * 发调用发票需开IP白名单。本地ip经常变更，放服务器调用
      */
     private final RestTemplate restTemplate = new RestTemplate();
-    @Value(value = "${sap.TARGET_URL_Poc}")
-    private String  TARGET_URL ;
+    //@Value(value = "${sap.TARGET_URL_Poc}")
+    private String  TARGET_URL ="http://139.224.3.140:8091/stms/openapi/income/bookkeeping";
 
     @PostMapping("/bookkeeping")
     public ResponseEntity<?> forwardRequest( @RequestBody Object requestBody) {