Merge remote-tracking branch 'origin/release' into release

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -414,12 +414,14 @@ public class SDNYMainProcessController extends AbstractController {
             object.setZFILED2("");
             object.setZFILED3("");
             object.setZFILED4("");
-            List<GsClient> gsClients = gsClientMapper.selectByGsdm(orgCode);
+//            List<GsClient> gsClients = gsClientMapper.selectByGsdm(orgCode);
-            if(gsClients != null && gsClients.size() > 0) {
+//            if(gsClients != null && gsClients.size() > 0) {
-                object.setZFILED5(gsClients.get(0).getClient());
+//                object.setZFILED5(gsClients.get(0).getClient());
-            }else{
+//            }else{
-                object.setZFILED5(environment);
+//                object.setZFILED5(environment);
-            }
+//            }
+
+            object.setZFILED5(environment);
             List<SAPInvoiceInfo> sapInvoiceInfos = new ArrayList<>();
             if (invoiceInfoList != null && invoiceInfoList.size() > 0) {
                 for (SNInvoice invoice : invoiceInfoList) {

dxhy-erp/src/main/resources/bootstrap-std.yaml

@@ -4,13 +4,13 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 172.31.36.147:33000
+        server-addr: 172.31.36.143:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
         # Nacos config 分组
         group: dxhy-erp-group
         # Nacos config 登录用户名
-        username: nacos
+        username: admin
         # Nacos config 登录密码
         password: Invoice.nacos.!1
         # Nacos config 配置文件前缀
@@ -19,9 +19,9 @@ spring:
         file-extension: yaml
       # Nacos discovery 配置
       discovery:
-        server-addr: 172.31.36.147:33000
+        server-addr: 172.31.36.143:33000
         # Nacos config 登录用户名
-        username: nacos
+        username: admin
         # Nacos config 登录密码
         password: Invoice.nacos.!1
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c