wangliwen
|
5581cabf8f
|
Merge branch 'master' into docker_package
|
2022-10-17 13:11:49 +08:00 |
|
wangliwen
|
f8241322ef
|
Merge branch 'dev'
|
2022-10-17 13:11:40 +08:00 |
|
wangliwen
|
0d44e8c81c
|
Merge remote-tracking branch '备份/dev' into dev
# Conflicts:
# renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
|
2022-10-17 13:11:30 +08:00 |
|
wangliwen
|
ce11e658ff
|
HIQDUCS-100 的处理
|
2022-10-17 13:09:46 +08:00 |
 huangweixiong
|
234732dea0
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform: (64 commits)
发起人主动终止时 补充意见
环境不一致，sql修改
草泥马
..
去掉
..
1.系统运行初始化数据调整 2.修复后台能力统计能力申请明细会议室申请状态错误bug
调整
。。。
屮
。。。
。。。
屮尼玛
...
后台能力统计明细增加会议室申请
。。。
apply_amount 增加会客厅数量
...
sql文件命名冲突
1.修改前后台能力申请统计逻辑，加入会议室申请统计 2.赋能场景增加字段
...
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorControllerV2.java
|
2022-10-15 00:26:07 +08:00 |
|
huangweixiong
|
6a50857c2e
|
升级shiro，阿里云暂时没有最新包
|
2022-10-15 00:22:13 +08:00 |
|
huangweixiong
|
79b86cb96c
|
亚威组织导出接口
|
2022-10-15 00:21:28 +08:00 |
 lizhicheng
|
85d1e9eddf
|
设备申请新增设备详情字段
|
2022-10-14 17:23:53 +08:00 |
|
lizhicheng
|
64e53c3535
|
统计报表状态修改
|
2022-10-14 14:57:46 +08:00 |
|
wangliwen
|
19844fdfc2
|
Merge branch 'master' into docker_package
|
2022-10-14 11:27:06 +08:00 |
|
wangliwen
|
a1fbce7737
|
Merge branch 'dev'
|
2022-10-14 11:26:58 +08:00 |
|
wangliwen
|
b1376f4646
|
发起人主动终止时 补充意见
|
2022-10-14 11:25:58 +08:00 |
|
wangliwen
|
f80c31fc21
|
Merge branch 'master' into docker_package
|
2022-10-14 11:15:12 +08:00 |
|
wangliwen
|
27b34d26c2
|
Merge branch 'dev'
|
2022-10-14 11:15:04 +08:00 |
 dinggang
|
74523031c8
|
环境不一致，sql修改
|
2022-10-13 23:43:55 +08:00 |
|
wangliwen
|
19db902082
|
Merge branch 'master' into docker_package
|
2022-10-13 23:08:18 +08:00 |
|
wangliwen
|
4fdfb45b1c
|
Merge branch 'dev'
|
2022-10-13 23:08:11 +08:00 |
|
wangliwen
|
e920447f39
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-10-13 23:08:01 +08:00 |
|
wangliwen
|
2ca1096ecc
|
草泥马
|
2022-10-13 23:07:37 +08:00 |
|
dinggang
|
227db45035
|
..
|
2022-10-13 23:04:15 +08:00 |
|
wangliwen
|
24f1053ddd
|
Merge branch 'master' into docker_package
|
2022-10-13 22:57:17 +08:00 |
|
wangliwen
|
14768c994a
|
Merge branch 'dev'
|
2022-10-13 22:57:09 +08:00 |
|
wangliwen
|
7ca30e38c2
|
去掉
|
2022-10-13 22:56:49 +08:00 |
|
wangliwen
|
638630b57a
|
Merge branch 'master' into docker_package
|
2022-10-13 22:03:24 +08:00 |
|
wangliwen
|
339dd090fc
|
Merge branch 'dev'
|
2022-10-13 22:03:14 +08:00 |
|
dinggang
|
de5d3738d7
|
..
|
2022-10-13 22:02:20 +08:00 |
|
wangliwen
|
033299353c
|
Merge branch 'master' into docker_package
|
2022-10-13 21:50:18 +08:00 |
|
wangliwen
|
096470457e
|
Merge branch 'dev'
|
2022-10-13 21:50:11 +08:00 |
|
dinggang
|
88bbff3b8f
|
1.系统运行初始化数据调整
2.修复后台能力统计能力申请明细会议室申请状态错误bug
|
2022-10-13 21:47:31 +08:00 |
|
wangliwen
|
775195cad7
|
Merge branch 'master' into docker_package
|
2022-10-13 21:32:24 +08:00 |
|
wangliwen
|
2b599faa4a
|
Merge branch 'dev'
|
2022-10-13 21:32:12 +08:00 |
|
wangliwen
|
f3cb2206cb
|
调整
|
2022-10-13 21:32:01 +08:00 |
|
wangliwen
|
7a43f96c9a
|
...
|
2022-10-13 21:21:38 +08:00 |
|
wangliwen
|
719484fad7
|
Merge branch 'dev'
|
2022-10-13 20:58:20 +08:00 |
|
wangliwen
|
1373ab7088
|
。。。
|
2022-10-13 20:58:11 +08:00 |
|
wangliwen
|
88e00d54d8
|
Merge branch 'dev'
|
2022-10-13 20:43:00 +08:00 |
|
wangliwen
|
0e3e460164
|
屮
|
2022-10-13 20:42:53 +08:00 |
|
wangliwen
|
2928c04e85
|
Merge branch 'dev'
|
2022-10-13 20:34:56 +08:00 |
|
wangliwen
|
c348b6d9eb
|
。。。
|
2022-10-13 20:34:49 +08:00 |
|
wangliwen
|
2673802567
|
Merge branch 'dev'
|
2022-10-13 20:26:02 +08:00 |
|
wangliwen
|
127a4f7a56
|
。。。
|
2022-10-13 20:25:40 +08:00 |
|
wangliwen
|
dd957414d8
|
Merge branch 'dev'
|
2022-10-13 20:21:54 +08:00 |
|
wangliwen
|
fa138f5b57
|
屮尼玛
|
2022-10-13 20:21:46 +08:00 |
|
wangliwen
|
0b9505136f
|
Merge branch 'dev'
|
2022-10-13 19:49:45 +08:00 |
|
wangliwen
|
d67abf81a1
|
...
|
2022-10-13 19:49:34 +08:00 |
|
wangliwen
|
65112dc728
|
Merge branch 'dev'
|
2022-10-13 17:52:03 +08:00 |
|
dinggang
|
785276c635
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-10-13 17:50:47 +08:00 |
|
dinggang
|
98a0715bf5
|
后台能力统计明细增加会议室申请
|
2022-10-13 17:50:17 +08:00 |
|
wangliwen
|
e0cd927455
|
Merge branch 'dev'
|
2022-10-13 17:49:13 +08:00 |
|
wangliwen
|
e98febf4c6
|
。。。
|
2022-10-13 17:49:06 +08:00 |