wangliwen
|
70ad06f8cd
|
Merge branch 'master' into docker_package
|
2022-11-01 11:45:29 +08:00 |
|
wangliwen
|
22db38b947
|
Merge branch 'dev'
|
2022-11-01 11:45:22 +08:00 |
|
wangliwen
|
14761e669c
|
...
|
2022-11-01 11:45:12 +08:00 |
|
wangliwen
|
c52dca1fbf
|
Merge branch 'master' into docker_package
|
2022-11-01 11:31:24 +08:00 |
|
wangliwen
|
279565b329
|
Merge branch 'dev'
|
2022-11-01 11:31:17 +08:00 |
|
wangliwen
|
b9550748fa
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-11-01 11:31:06 +08:00 |
|
wangliwen
|
cca87f9fbd
|
全局数量排序
|
2022-11-01 11:30:57 +08:00 |
 lizhicheng
|
59fd3fb7d6
|
会议室改为会客厅、首页统计顺序
|
2022-11-01 09:36:24 +08:00 |
|
wangliwen
|
a2bd71734f
|
Merge branch 'master' into docker_package
|
2022-10-31 18:10:14 +08:00 |
|
wangliwen
|
40279ba0d8
|
Merge branch 'dev'
|
2022-10-31 18:10:07 +08:00 |
|
wangliwen
|
f25d4b1d56
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-10-31 18:09:53 +08:00 |
 dinggang
|
c4dcb0c4cc
|
减少数据资源接口调用超时日志输出
|
2022-10-31 18:08:58 +08:00 |
|
wangliwen
|
4e797d4e83
|
。。。
|
2022-10-31 18:08:23 +08:00 |
|
wangliwen
|
28914c70f9
|
Merge branch 'master' into docker_package
|
2022-10-31 16:47:31 +08:00 |
|
wangliwen
|
e88423a9d9
|
Merge branch 'dev'
|
2022-10-31 16:47:24 +08:00 |
|
wangliwen
|
468c71b304
|
屮
|
2022-10-31 16:47:16 +08:00 |
|
wangliwen
|
9b8d25b1fa
|
Merge branch 'master' into docker_package
|
2022-10-31 16:35:46 +08:00 |
|
wangliwen
|
f7fe8fb7a5
|
Merge branch 'dev'
|
2022-10-31 16:35:39 +08:00 |
|
wangliwen
|
9d832a0955
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-10-31 16:35:29 +08:00 |
|
wangliwen
|
ca652464d9
|
配置是否发送亚微消息
|
2022-10-31 16:35:21 +08:00 |
|
dinggang
|
6375d433c6
|
1.能力使用申请应用系统查询增加查询自己部门上架应用限制
2.能力使用统计时间错误bug
3.部门列表查询bug修复
|
2022-10-31 16:16:14 +08:00 |
|
wangliwen
|
ec98e97064
|
Merge branch 'master' into docker_package
|
2022-10-31 14:57:48 +08:00 |
|
wangliwen
|
3ddd730000
|
Merge branch 'dev'
|
2022-10-31 14:57:36 +08:00 |
|
lizhicheng
|
ddd1c3196a
|
部门分页、url前缀改为ucs-admin
|
2022-10-31 14:55:36 +08:00 |
|
wangliwen
|
e42d997ce3
|
Merge branch 'master' into docker_package
|
2022-10-31 13:50:00 +08:00 |
|
wangliwen
|
b7d81a8558
|
Merge branch 'dev'
|
2022-10-31 13:49:53 +08:00 |
|
wangliwen
|
fd7b66bba9
|
区域部门管理员只出本区域部门信息
|
2022-10-31 13:49:45 +08:00 |
|
wangliwen
|
d5a0c354b9
|
Merge branch 'master' into docker_package
|
2022-10-31 12:52:34 +08:00 |
|
wangliwen
|
a06044a8ba
|
Merge branch 'dev'
|
2022-10-31 12:52:27 +08:00 |
|
wangliwen
|
2af6dfc830
|
...
|
2022-10-31 12:52:18 +08:00 |
|
wangliwen
|
4f3812b740
|
Merge branch 'master' into docker_package
|
2022-10-31 11:42:14 +08:00 |
|
wangliwen
|
f9cce65adc
|
Merge branch 'dev'
|
2022-10-31 11:42:07 +08:00 |
|
wangliwen
|
a16c129c51
|
...
|
2022-10-31 11:41:58 +08:00 |
|
wangliwen
|
5f8909b84e
|
Merge branch 'master' into docker_package
|
2022-10-31 11:08:20 +08:00 |
|
wangliwen
|
f9bbd078c4
|
Merge branch 'dev'
|
2022-10-31 11:08:12 +08:00 |
|
wangliwen
|
1be6e6d2bd
|
npe
|
2022-10-31 11:08:04 +08:00 |
|
wangliwen
|
a640fca271
|
Merge branch 'master' into docker_package
|
2022-10-31 10:47:56 +08:00 |
|
wangliwen
|
215090891f
|
Merge branch 'dev'
|
2022-10-31 10:47:48 +08:00 |
|
wangliwen
|
ceb3a5ec67
|
...
|
2022-10-31 10:47:40 +08:00 |
|
wangliwen
|
7bb2763150
|
Merge branch 'master' into docker_package
|
2022-10-31 10:43:35 +08:00 |
|
wangliwen
|
b92b96bbe1
|
Merge branch 'dev'
|
2022-10-31 10:42:17 +08:00 |
|
wangliwen
|
f59eb5471f
|
区域管理员只出本区域
|
2022-10-31 10:42:07 +08:00 |
|
wangliwen
|
7884d2dcc4
|
Merge branch 'master' into docker_package
|
2022-10-31 10:06:27 +08:00 |
|
wangliwen
|
80a0aa8325
|
Merge branch 'dev'
|
2022-10-31 10:06:14 +08:00 |
|
wangliwen
|
1d70c445e6
|
用户管理导出数据不正确的处理
|
2022-10-31 10:05:52 +08:00 |
|
wangliwen
|
48abe30209
|
Merge branch 'master' into docker_package
|
2022-10-29 15:14:43 +08:00 |
|
wangliwen
|
79bb951644
|
Merge branch 'dev'
|
2022-10-29 15:14:36 +08:00 |
|
wangliwen
|
d2d2c70801
|
。。。
|
2022-10-29 15:14:26 +08:00 |
|
wangliwen
|
a740056eba
|
Merge branch 'master' into docker_package
|
2022-10-29 14:38:24 +08:00 |
|
wangliwen
|
9058284498
|
Merge branch 'dev'
|
2022-10-29 14:38:17 +08:00 |