 zhangxiongfeng
|
285764928c
|
大华口门对接1.0
(cherry picked from commit 65ad2b538e)
|
2026-08-04 16:32:38 +08:00 |
|
zhangxiongfeng
|
c227c8def6
|
Merge remote-tracking branch 'origin/dev' into dahua_koumen
|
2026-08-04 14:58:59 +08:00 |
|
zhangxiongfeng
|
3ef3dca48b
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-04 14:53:06 +08:00 |
|
zhangxiongfeng
|
ae529ebcac
|
大华口门对接
(cherry picked from commit 65ad2b538e)
# Conflicts:
# web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
# web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java
# web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
|
2026-08-04 14:52:34 +08:00 |
|
zhangxiongfeng
|
b7ba5e46c2
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-04 14:51:08 +08:00 |
|
zhangxiongfeng
|
bb0a5912d6
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-04 14:13:09 +08:00 |
|
zhangxiongfeng
|
5aa49b9a3e
|
Merge remote-tracking branch 'origin/dev' into dahua_koumen
# Conflicts:
# start/src/main/resources/bootstrap.yml
|
2026-08-04 13:50:32 +08:00 |
|
zhangxiongfeng
|
af812fd3a7
|
大华口门部门id修改
|
2026-08-03 16:23:36 +08:00 |
|
zhangxiongfeng
|
042a44aebe
|
大华口门对接
(cherry picked from commit 604d96b3fa)
|
2026-08-03 16:23:30 +08:00 |
|
zhangxiongfeng
|
256ad8f364
|
删除 start/src/main/resources/application.yml
(cherry picked from commit 9c78c946bc)
|
2026-08-03 16:23:27 +08:00 |
|
zhangxiongfeng
|
ceb533d6a6
|
删除 start/src/main/java/com/zcloud/basic/info/config/LocalDevFilterConfig.java
(cherry picked from commit aee2515e20)
|
2026-08-03 16:23:24 +08:00 |
|
zhangxiongfeng
|
ccd10c317b
|
大华口门对接
(cherry picked from commit ac94e9fe88)
|
2026-08-03 16:23:17 +08:00 |
|
zhangxiongfeng
|
e369717b9d
|
大华口门对接
(cherry picked from commit bcb9d32b95)
|
2026-08-03 16:23:09 +08:00 |
|
zhangxiongfeng
|
0117f3b1af
|
大华口门对接
(cherry picked from commit 8beed9d73d)
|
2026-08-03 16:22:54 +08:00 |
|
zhangxiongfeng
|
3a8035841b
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-03 16:22:48 +08:00 |
|
zhangxiongfeng
|
70da6bacad
|
大华口门对接
(cherry picked from commit bcb9d32b95)
|
2026-08-03 16:22:16 +08:00 |
|
zhangxiongfeng
|
566e2c9158
|
大华口门对接
(cherry picked from commit 8beed9d73d)
|
2026-08-03 16:22:00 +08:00 |
|
zhangxiongfeng
|
4a462f7b56
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-03 16:21:55 +08:00 |
|
zhangxiongfeng
|
92ed2c3177
|
大华口门对接
(cherry picked from commit bcb9d32b95)
|
2026-08-03 16:19:19 +08:00 |
|
zhangxiongfeng
|
5d34e2ab40
|
大华口门对接
(cherry picked from commit 8beed9d73d)
|
2026-08-03 16:17:26 +08:00 |
|
zhangxiongfeng
|
20f9c5ebd2
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-03 16:16:46 +08:00 |
|
zhangxiongfeng
|
59748186c6
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-03 16:15:23 +08:00 |
|
zhangxiongfeng
|
92cc6154c3
|
大华口门对接
(cherry picked from commit ac94e9fe88)
|
2026-08-03 16:05:23 +08:00 |
|
zhangxiongfeng
|
460679ea62
|
大华口门对接
(cherry picked from commit 604d96b3fa)
|
2026-08-03 16:04:55 +08:00 |
|
zhangxiongfeng
|
8b5a9d6f7f
|
大华口门对接
(cherry picked from commit bcb9d32b95)
|
2026-08-03 16:03:41 +08:00 |
|
zhangxiongfeng
|
bd29d0063d
|
大华口门对接
(cherry picked from commit 604d96b3fa)
|
2026-08-03 16:01:30 +08:00 |
|
zhangxiongfeng
|
f5d06a08c7
|
大华口门部门id修改
|
2026-08-03 16:00:06 +08:00 |
|
zhangxiongfeng
|
85d55a77d9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-08-03 10:52:11 +08:00 |
|
zhangxiongfeng
|
c83d18b8a1
|
大华口门部门id修改
|
2026-08-03 10:51:53 +08:00 |
 lishiwei
|
b9d8f32efa
|
Merge branch 'dev_update_pd' into dev
|
2026-07-30 09:27:30 +08:00 |
|
lishiwei
|
093e8f39ef
|
refactor(): 优化用户密码更新逻辑
|
2026-07-30 09:26:45 +08:00 |
|
zhangxiongfeng
|
4e3ee4e7ac
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-07-29 17:15:20 +08:00 |
|
zhangxiongfeng
|
604d96b3fa
|
大华口门对接
|
2026-07-29 17:15:00 +08:00 |
|
zhangxiongfeng
|
9c78c946bc
|
删除 start/src/main/resources/application.yml
|
2026-07-29 17:12:09 +08:00 |
|
zhangxiongfeng
|
aee2515e20
|
删除 start/src/main/java/com/zcloud/basic/info/config/LocalDevFilterConfig.java
|
2026-07-29 17:11:41 +08:00 |
|
lishiwei
|
15ffa41a95
|
chore(): 添加默认密码修改提醒注释
|
2026-07-29 11:47:09 +08:00 |
|
zhangxiongfeng
|
ac94e9fe88
|
大华口门对接
|
2026-07-28 18:25:57 +08:00 |
 zhaokai
|
f670036b18
|
config(bootstrap): 切换到生产环境配置文件
|
2026-07-28 18:16:54 +08:00 |
|
zhaokai
|
ba47d2324f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-07-28 18:07:06 +08:00 |
|
zhaokai
|
1ce6637c07
|
Merge branch 'dev_visual_page' into dev
|
2026-07-28 18:06:53 +08:00 |
|
zhangxiongfeng
|
bcb9d32b95
|
大华口门对接
|
2026-07-28 16:58:06 +08:00 |
|
zhangxiongfeng
|
9bb96f109d
|
Merge branch 'dev' of http://47.92.113.182:3000/zcloud_gbs/zcloud_gbs_basic_info_gwj into komen
|
2026-07-28 15:29:24 +08:00 |
|
zhangxiongfeng
|
8beed9d73d
|
大华口门对接
|
2026-07-28 15:29:07 +08:00 |
|
lishiwei
|
3b940c0619
|
feat: 优化修改密码逻辑
|
2026-07-28 14:29:20 +08:00 |
|
zhaokai
|
0feb06ba0d
|
feat(CorpInfoController): 添加查询当前登录租户企业详情接口
|
2026-07-28 11:20:52 +08:00 |
|
zhaokai
|
ef0dddf572
|
Merge branch 'dev_visual_page' into dev
|
2026-07-28 11:20:06 +08:00 |
|
zhaokai
|
88f58d580f
|
feat(CorpInfoController): 添加查询当前登录租户企业详情接口
|
2026-07-28 11:19:46 +08:00 |
|
zhangxiongfeng
|
65ad2b538e
|
大华口门对接
|
2026-07-28 10:33:46 +08:00 |
|
zhangxiongfeng
|
2cc429996f
|
Merge remote-tracking branch 'origin/dev' into komen
|
2026-07-28 08:43:16 +08:00 |
|
zhaokai
|
a6c3aab30c
|
Merge branch 'dev_visual_page' into dev
|
2026-07-27 15:13:27 +08:00 |