From bbfb4d9d66d230e4ae55d51bf2df1a747dc1a25a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 24 六月 2025 11:16:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml | 2 +-
src/main/java/org/jeecg/modules/system/entity/SysUser.java | 4 ++--
src/main/resources/application-dev.yml | 10 +++++-----
src/main/resources/application.yml | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/src/main/java/org/jeecg/modules/system/entity/SysUser.java
index 945b3ae..233d20b 100644
--- a/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+++ b/src/main/java/org/jeecg/modules/system/entity/SysUser.java
@@ -184,8 +184,8 @@
/**
* 璐熻矗浜х嚎
*/
- @Excel(name="璐熻矗浜х嚎",width = 15,dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
- @Dict(dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
+ @Excel(name="璐熻矗浜х嚎",width = 15,dictTable ="base_factory",dicText = "factory_name",dicCode = "id")
+ @Dict(dictTable ="base_factory",dicText = "factory_name",dicCode = "id")
private String productionIds;
/**
diff --git a/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
index 2eda850..535c50d 100644
--- a/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
+++ b/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
@@ -185,7 +185,7 @@
<!-- 鏌ヨ鐢ㄦ埛鐨勬墍灞炰骇绾垮悕绉颁俊鎭� -->
<select id="getProNamesByUserIds" resultType="org.jeecg.modules.system.vo.MdcUserProVo">
- SELECT p.production_name, up.user_id FROM mdc_user_production up, mdc_production p WHERE p.id = up.pro_id AND up.user_id IN
+ SELECT p.factory_name productionName, up.user_id FROM base_user_factory up, base_factory p WHERE p.id = up.factory_id AND up.user_id IN
<foreach collection="userIds" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 6a86568..51d32d3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
锘縮erver:
- port: 9999
+ port: 9989
tomcat:
max-swallow-size: -1
error:
@@ -126,9 +126,9 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=LXZN_TEST_HANGYU;nullCatalogMeansCurrent=true
+ url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_XHJ;nullCatalogMeansCurrent=true
username: sa
- password: sa123
+ password: 123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
#redis 閰嶇疆
redis:
@@ -312,9 +312,9 @@
#宸ユ帶缃�/娑夊瘑缃戦儴缃� 0涓烘秹瀵嗙綉 1涓哄伐鎺х綉
deployType: 0
#娑夊瘑缃戜紶杈搉c鏂囦欢澶�
- secretFolder: D:\\hy_test\\a
+ secretFolder: D:\\opt
#宸ユ帶缃戠洃鎺c鏂囦欢澶�
- workFolder: D:\\hy_test\\b
+ workFolder: D:\\opt
sap:
rfc:
destination: SAP_RFC_DEST # 鑷畾涔夌殑鐩爣鍦板潃 RFC 鐩爣鍚嶇О
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a543aab..b396120 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,5 +2,5 @@
application:
name: jeecg-system
profiles:
- active: '@profile.name@'
-# active: dev
+ # active: '@profile.name@'
+ active: dev
--
Gitblit v1.9.3