Merge branch 'dev' into feature/dev-0729

# Conflicts: # mhd_bms/src/main/resources/bootstrap.yml
2026-08-08 11:39:21 +08:00
parent 1c29c7e5e4 3991496617
commit 4b29406701
52 changed files with 2552 additions and 963 deletions
@@ -14,18 +14,18 @@ spring:
    nacos:
      discovery:
 #        server-addr: 127.0.0.1:8848
-#        server-addr: 10.33.0.129:6010
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.30:6848
+#        server-addr: 10.102.192.31:6848
        username: nacos
        password: manhuoda@2023
        #线上正式环境
 #        server-addr: 10.102.192.105:6848
      config:
 #        server-addr: 127.0.0.1:8848
-#        server-addr: 10.33.0.129:6010
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.30:6848
+#        server-addr: 10.102.192.31:6848
        username: nacos
        password: manhuoda@2023
        #线上正式环境
@@ -148,6 +148,7 @@
          AND a.top_organization_id = #{expenseAccountDO.topOrganizationId}
          AND a.subject_code = #{expenseAccountDO.subjectCode}
          AND a.status = 1
+        LIMIT 1
    </select>