chenbowen
|
dd38e65972
|
Merge branch 'dev' into test
|
2025-11-25 20:09:31 +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 |
|
chenbowen
|
829229a355
|
Merge branch 'dev' into test
|
2025-11-25 19:15:29 +08:00 |
|
chenbowen
|
067f7226f4
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 19:14:59 +08:00 |
|
chenbowen
|
b35df8493c
|
同步 nacos 配置到基础系统
|
2025-11-25 19:13:27 +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
|
f16509c107
|
Merge branch 'dev' into test
|
2025-11-25 18:58:07 +08:00 |
|
chenbowen
|
565a625df7
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 18:57:47 +08:00 |
|
chenbowen
|
adcea87bbf
|
同步 nacos 配置到基础系统
|
2025-11-25 18:56:12 +08:00 |
|
chenbowen
|
a79806690d
|
Merge branch 'dev' into test
|
2025-11-25 17:43:28 +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
|
06d9ae2688
|
Merge branch 'dev' into test
|
2025-11-25 17:22:53 +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
|
9a0e60ad84
|
Merge branch 'dev' into test
|
2025-11-25 17:19:06 +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
|
30b22698e8
|
Merge branch 'dev' into test
|
2025-11-25 16:50:11 +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
|
3d5f07b7a5
|
Merge branch 'dev' into test
|
2025-11-25 16:08:41 +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
|
f8d95218f5
|
Merge branch 'dev' into test
|
2025-11-25 15:55:44 +08:00 |
|
chenbowen
|
e0d5c0221e
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 15:55:13 +08:00 |
|
chenbowen
|
59afa893b0
|
修复编译错误
|
2025-11-25 15:54:50 +08:00 |
|
chenbowen
|
d4d80ce86a
|
iwork 人员组织同步相关
|
2025-11-25 15:48:47 +08:00 |
|
chenbowen
|
70868a77c0
|
Merge branch 'dev' into test
|
2025-11-25 09:15:54 +08:00 |
|
chenbowen
|
eab968da72
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# pom.xml
|
2025-11-25 09:15:32 +08:00 |
|
chenbowen
|
e212ba4d2f
|
升级版本
|
2025-11-25 09:14:36 +08:00 |
|
chenbowen
|
4ddd38c3b6
|
1. 升级 3.0.45
|
2025-11-24 19:45:47 +08:00 |
|
chenbowen
|
54f763c15e
|
Merge branch 'dev' into test
|
2025-11-24 19:35:37 +08:00 |
|
chenbowen
|
65f62fddd6
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-24 19:19:09 +08:00 |
|
chenbowen
|
65b99740c1
|
新增 long 集合类型的 string 转换
|
2025-11-24 19:18:23 +08:00 |
|
chenbowen
|
f7ee073617
|
Merge branch 'dev' into test
|
2025-11-24 15:54:06 +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 |
|
qianshijiang
|
3d3808be48
|
编译报错修改。
|
2025-11-24 09:52:28 +08:00 |
|
qianshijiang
|
6b266e3211
|
编译报错修改。
|
2025-11-24 09:49:44 +08:00 |
|
chenbowen
|
491f8c8b1f
|
Merge branch 'dev' into test
|
2025-11-21 18:30:32 +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
|
8dd7ccaf5f
|
Merge branch 'dev' into test
|
2025-11-21 17:25:09 +08:00 |
|
chenbowen
|
14c81350bd
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-21 17:24:41 +08:00 |
|
chenbowen
|
7e3baeba46
|
修复 nacos 刷新配置后，ignoreurl 失效的bug
|
2025-11-21 17:23:36 +08:00 |
|
chenbowen
|
4106cfced2
|
Merge branch 'dev' into test
# Conflicts:
# zt-dependencies/pom.xml
|
2025-11-20 18:36:13 +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 |
|