qiubo 4 роки тому
батько
коміт
cfe2033861

+ 2 - 2
forest-admin/admin-server/src/main/resources/bootstrap.yml

@@ -9,8 +9,8 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.16.90.64:8898
+        server-addr: 172.16.90.50:8838
       config:
-        server-addr: 172.16.90.64:8898
+        server-addr: 172.16.90.50:8838
         prefix: forest-admin
         file-extension: yaml

+ 2 - 2
forest-admin/admin-server/src/main/resources/dao/BigCompanyDao.xml

@@ -27,7 +27,7 @@
 
         SELECT
         a.id,
-        a.comp_name AS NAME,
+        a.comp_name AS name,
         a.comp_con_person AS compConPerson,
         a.comp_con_num AS compConNum,
         concat( a.province_id, a.city_id, a.county_id ) AS address,
@@ -50,7 +50,7 @@
         UNION ALL
         SELECT
         CONCAT( b.id, '9999' ) AS id,
-        b.comp_name AS NAME,
+        b.comp_name AS name,
         b.comp_con_person AS compConPerson,
         NULL AS compConNum,
         concat( b.province_id, b.city_id, b.county_id ) AS address,

+ 2 - 2
forest-gateway/src/main/resources/bootstrap.yml

@@ -9,9 +9,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8898
+        server-addr: 127.0.0.1:8838
       config:
-        server-addr: 127.0.0.1:8898
+        server-addr: 127.0.0.1:8838
         prefix: forest-gateway
         file-extension: yaml
     gateway: