diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml index 0631b3d55..133dd80ec 100644 --- a/mhd-user-center/src/main/resources/bootstrap.yml +++ b/mhd-user-center/src/main/resources/bootstrap.yml @@ -20,9 +20,7 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 #线上正式环境 # server-addr: 10.102.192.5:6848 # username: nacos @@ -30,9 +28,7 @@ spring: config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 #线上正式环境 # server-addr: 10.102.192.5:6848 # username: nacos diff --git a/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml b/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml index e54fdc9ba..550ee87d3 100644 --- a/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml +++ b/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml @@ -135,9 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT SUBJECT_NAME,AMOUNT,RATE FROM - RECONCILIATION_ACCOUNT + RECONCILIATION r left join RECONCILIATION_ACCOUNT acc on acc.RECONCILIATION_ID = r.RECONCILIATION_ID left join NGWL_TEST_WLHY.TMS_INVOICE_LIST tms on r.APPLY_NUMBER = tms.APPLY_NUMBER WHERE - RECONCILIATION_ID = #{invoiceId} + tms.ID = #{invoiceId}