chenbowen
|
db3afb5b64
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-28 11:07:42 +08:00 |
|
chenbowen
|
542466270a
|
1. 修复自定义 sql 中大写表名无法匹配到 mybatis 中的缓存表信息，导致表被忽略租户的问题
2. 新增 iwork feign api 调用
|
2025-11-28 11:05:09 +08:00 |
|
chenbowen
|
03ebe21670
|
1. 清理 iwork 无用的接口。
2. 整合 iwork 用户的密码管理策略。
|
2025-11-27 20:25:02 +08:00 |
|
chenbowen
|
64d0d4e55e
|
1. iwork 统一用印发起接口
|
2025-11-27 20:19:27 +08:00 |
|
chenbowen
|
256bf22a10
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 20:12:46 +08:00 |
|
chenbowen
|
76eabb6db0
|
修复 system 模块编译错误
|
2025-11-26 20:12:07 +08:00 |
|
qianshijiang
|
00956030a4
|
错误信息未记录到日志文件
|
2025-11-26 15:52:00 +08:00 |
|
chenbowen
|
dbb1d1905e
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 13:46:02 +08:00 |
|
chenbowen
|
08232eb3cb
|
iwork 人员组织同步相关
|
2025-11-26 13:45:06 +08:00 |
|
chenbowen
|
e9994a24c2
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 12:39:44 +08:00 |
|
chenbowen
|
a10732119b
|
iwork 人员组织同步相关
|
2025-11-26 12:38:38 +08:00 |
|
qianshijiang
|
e7efddf976
|
配置mybais-plus打印sql
|
2025-11-26 11:57:17 +08:00 |
|
chenbowen
|
61e61d08b6
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 11:34:41 +08:00 |
|
chenbowen
|
5698c34185
|
iwork 人员组织同步相关
|
2025-11-26 11:34:04 +08:00 |
|
qianshijiang
|
96058e29c2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-26 10:44:28 +08:00 |
|
qianshijiang
|
27d22de4e0
|
日志配置修改
|
2025-11-26 10:44:13 +08:00 |
|
chenbowen
|
0c0d82f465
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 10:43:04 +08:00 |
|
chenbowen
|
12ba2cf756
|
iwork 人员组织同步相关
|
2025-11-26 10:42:24 +08:00 |
|
chenbowen
|
a2f2325119
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 01:48:31 +08:00 |
|
chenbowen
|
4c79ac8a6d
|
iwork 人员组织同步相关
|
2025-11-26 01:48:10 +08:00 |
|
chenbowen
|
a263632e49
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 01:34:50 +08:00 |
|
chenbowen
|
2e2b7ac6fa
|
iwork 人员组织同步相关
|
2025-11-26 01:34:08 +08:00 |
|
chenbowen
|
299132943c
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 01:05:55 +08:00 |
|
chenbowen
|
76ba994b50
|
iwork 人员组织同步相关
|
2025-11-26 01:04:35 +08:00 |
|
chenbowen
|
685ed6b504
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 23:27:01 +08:00 |
|
chenbowen
|
f754b1c694
|
iwork 人员组织同步相关
|
2025-11-25 23:26:26 +08:00 |
|
chenbowen
|
dc1db47d07
|
iwork 人员组织同步相关
|
2025-11-25 20:31:56 +08:00 |
|
chenbowen
|
02e0c81446
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 20:09:06 +08:00 |
|
chenbowen
|
6c8c479984
|
同步 nacos 配置到基础系统
|
2025-11-25 20:08:31 +08:00 |
|
hewencai
|
518aa2a773
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-25 19:09:13 +08:00 |
|
hewencai
|
4003388740
|
feat:集成移动云mas短信平台
|
2025-11-25 19:08:55 +08:00 |
|
chenbowen
|
8689c5e844
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 17:42:26 +08:00 |
|
chenbowen
|
5be1b75be8
|
iwork 人员组织同步相关，兼容 iwork 返回
|
2025-11-25 17:41:39 +08:00 |
|
chenbowen
|
547b1d9afb
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 17:22:36 +08:00 |
|
chenbowen
|
2f9c28f166
|
iwork 人员组织同步相关，兼容 iwork 返回
|
2025-11-25 17:22:11 +08:00 |
|
chenbowen
|
c24ae5bad8
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 17:18:43 +08:00 |
|
chenbowen
|
64eb031486
|
iwork 人员组织同步相关，兼容 iwork 返回
|
2025-11-25 17:18:04 +08:00 |
|
chenbowen
|
95fab27556
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 16:49:43 +08:00 |
|
chenbowen
|
2efb815d59
|
iwork 人员组织同步相关，兼容 iwork 返回
|
2025-11-25 16:41:29 +08:00 |
|
chenbowen
|
77b4e62def
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 16:06:41 +08:00 |
|
chenbowen
|
e2dbaf12a4
|
iwork 人员组织同步相关
|
2025-11-25 16:05:52 +08:00 |
|
chenbowen
|
e0d5c0221e
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 15:55:13 +08:00 |
|
chenbowen
|
d4d80ce86a
|
iwork 人员组织同步相关
|
2025-11-25 15:48:47 +08:00 |
|
chenbowen
|
4b17c1d833
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-24 15:53:49 +08:00 |
|
chenbowen
|
77c46acf9e
|
1. 修改请求 iwork 的传参方式
|
2025-11-24 15:51:45 +08:00 |
|
chenbowen
|
e57f649e72
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-21 18:30:15 +08:00 |
|
chenbowen
|
ce39dc6d4b
|
1. iwork 二次适配
|
2025-11-21 18:20:11 +08:00 |
|
chenbowen
|
985b429f6f
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# zt-dependencies/pom.xml
|
2025-11-20 18:35:03 +08:00 |
|
chenbowen
|
0b646295da
|
1. 新增 iwork 同步用户组织信息接口
2. 修复错误设置版本信息在 zt-dependencies 的 bug
|
2025-11-20 18:27:01 +08:00 |
|
chenbowen
|
88fb1652e6
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# zt-dependencies/pom.xml
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/sso/ExternalSsoServiceImpl.java
|
2025-11-18 18:51:57 +08:00 |
|