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 |
|
wangliwen
|
639e885225
|
Merge branch 'dev'
|
2022-10-13 17:37:36 +08:00 |
|
wangliwen
|
cd6c670a18
|
apply_amount 增加会客厅数量
|
2022-10-13 17:37:25 +08:00 |
|
wangliwen
|
244f5ed2e4
|
Merge branch 'dev'
|
2022-10-13 17:06:38 +08:00 |
|
dinggang
|
c14fe24878
|
...
|
2022-10-13 17:04:58 +08:00 |
|
wangliwen
|
156756bac2
|
Merge branch 'dev'
|
2022-10-13 16:52:22 +08:00 |
|
dinggang
|
433d353d4f
|
sql文件命名冲突
|
2022-10-13 16:51:45 +08:00 |
|
wangliwen
|
208829c4f8
|
Merge branch 'dev'
|
2022-10-13 16:45:37 +08:00 |
|
dinggang
|
c583280b35
|
1.修改前后台能力申请统计逻辑，加入会议室申请统计
2.赋能场景增加字段
|
2022-10-13 16:44:46 +08:00 |
|
wangliwen
|
e7dc109193
|
Merge branch 'dev'
|
2022-10-13 14:50:34 +08:00 |
|
wangliwen
|
b45316d33b
|
屮
|
2022-10-13 14:50:23 +08:00 |
|
wangliwen
|
eb543c2695
|
Merge branch 'dev'
|
2022-10-13 12:50:03 +08:00 |
|
wangliwen
|
a6733814ae
|
。。。
|
2022-10-13 12:49:54 +08:00 |
|
wangliwen
|
f8b0b44cb2
|
Merge branch 'dev'
|
2022-10-13 11:57:11 +08:00 |
|
wangliwen
|
b4cc23f323
|
屮
|
2022-10-13 11:57:03 +08:00 |
|
wangliwen
|
eaa8dc4482
|
Merge branch 'dev'
|
2022-10-13 11:49:29 +08:00 |
|
dinggang
|
1b87f215f9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-10-13 11:48:18 +08:00 |
|
dinggang
|
9113da88bb
|
后台管理-能力统计新增会议室申请统计
|
2022-10-13 11:47:42 +08:00 |
|
wangliwen
|
e40428d48e
|
Merge branch 'dev'
|
2022-10-13 11:46:42 +08:00 |
|
wangliwen
|
9fdda47fcc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-10-13 11:46:31 +08:00 |
|
wangliwen
|
8e4eac8030
|
tb_fuse_resource 字段调整
|
2022-10-13 11:46:24 +08:00 |
|
dinggang
|
2467da9106
|
字段名修改
|
2022-10-13 11:32:29 +08:00 |
|
dinggang
|
4f37523519
|
1.融合服务新增各种资源数量字段
|
2022-10-13 11:02:37 +08:00 |
|
wangliwen
|
3ecbda2a60
|
Merge branch 'dev'
|
2022-10-13 10:44:31 +08:00 |
|
wangliwen
|
1e8d781ba5
|
selectResourceListByType 接口数量调整
|
2022-10-13 10:43:36 +08:00 |
|
wangliwen
|
6cc646b959
|
Merge branch 'dev'
|
2022-10-13 10:17:56 +08:00 |
|
wangliwen
|
35b53fa901
|
文案调整
|
2022-10-13 10:17:44 +08:00 |
|
wangliwen
|
09998753b2
|
Merge remote-tracking branch 'origin/dev'
|
2022-10-13 09:39:47 +08:00 |
|
dinggang
|
02398a3641
|
1.同步sys_menu菜单
2.实现访客模式功能
|
2022-10-13 09:37:24 +08:00 |
|
wangliwen
|
05b57f3340
|
Merge branch 'dev'
|
2022-10-12 19:04:19 +08:00 |
|
wangliwen
|
7c763efbd6
|
...增加资源所属部门名称
|
2022-10-12 19:04:09 +08:00 |