From d01fa9d49a8c8a723493aecb681d4e1f3e25fce5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 一月 2024 14:28:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/.idea/dataSources.local.xml | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/.idea/dataSources.local.xml b/north-glass-erp/.idea/dataSources.local.xml
index a769897..2b874a0 100644
--- a/north-glass-erp/.idea/dataSources.local.xml
+++ b/north-glass-erp/.idea/dataSources.local.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="dataSourceStorageLocal" created-in="IU-232.9559.62">
- <data-source name="@localhost" uuid="521b6701-da00-48a8-bf4f-cf6bbb7d685d">
+ <data-source name="@localhost [2]" uuid="165c5447-d19a-4aaf-af5f-cee92ae696c2">
<database-info product="MySQL" version="8.0.22" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="8.0.22" exact-driver-version="8.0">
<extra-name-characters>#@</extra-name-characters>
<identifier-quote-string>`</identifier-quote-string>
- <jdbc-catalog-is-schema>true</jdbc-catalog-is-schema>
</database-info>
<case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
<secret-storage>master_key</secret-storage>
@@ -14,19 +13,16 @@
<introspection-scope>
<node kind="schema">
<name qname="@" />
+ <name qname="erp_sd" />
<name qname="erp_user_info" />
- <name qname="mm" />
- <name qname="pp" />
- <name qname="sd" />
</node>
</introspection-scope>
</schema-mapping>
</data-source>
- <data-source name="@10.153.19.150" uuid="2f24a638-142d-4401-9e71-359f1be8d502">
+ <data-source name="@10.153.19.150" uuid="1becdbe6-0c8e-40b3-a9c0-8b2c968172ca">
<database-info product="MySQL" version="8.0.19" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="8.0.19" exact-driver-version="8.0">
<extra-name-characters>#@</extra-name-characters>
<identifier-quote-string>`</identifier-quote-string>
- <jdbc-catalog-is-schema>true</jdbc-catalog-is-schema>
</database-info>
<case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
<secret-storage>master_key</secret-storage>
@@ -34,7 +30,6 @@
<schema-mapping>
<introspection-scope>
<node kind="schema">
- <name qname="@" />
<name qname="erp_user_info" />
<name qname="mm" />
<name qname="pp" />
--
Gitblit v1.8.0