wangliwen
|
6623fe87fd
|
Merge branch 'dev'
|
2022-10-12 18:52:05 +08:00 |
|
wangliwen
|
e6191ab72e
|
资源申请量去掉 基础设施数量
|
2022-10-12 18:51:19 +08:00 |
|
wangliwen
|
1362c2dcd3
|
Merge branch 'dev'
|
2022-10-12 17:11:35 +08:00 |
|
wangliwen
|
357971f23b
|
菜单增加 site 站点标识 字段
|
2022-10-12 17:11:04 +08:00 |
|
wangliwen
|
997edea1cd
|
Merge branch 'dev'
|
2022-10-12 16:20:42 +08:00 |
|
wangliwen
|
da4fab24bc
|
...
|
2022-10-12 16:20:32 +08:00 |
|
wangliwen
|
5c9a8a83d8
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-10-12 16:18:57 +08:00 |
|
wangliwen
|
57c0e17208
|
Merge branch 'dev'
|
2022-10-12 16:16:37 +08:00 |
|
wangliwen
|
48cccebdfd
|
通知文案调整
|
2022-10-12 16:15:51 +08:00 |
 lizhicheng
|
6e22e9929f
|
申请历史修改时长单位
|
2022-10-12 16:08:58 +08:00 |
|
wangliwen
|
500b68d429
|
Merge branch 'dev'
|
2022-10-12 15:57:33 +08:00 |
|
wangliwen
|
0c1a606dd4
|
增加我的待办各类型的待办数量
|
2022-10-12 15:57:18 +08:00 |
|
wangliwen
|
1a60f96ad8
|
Merge branch 'dev'
|
2022-10-12 15:15:36 +08:00 |
|
wangliwen
|
b19598a4cb
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-10-12 15:15:28 +08:00 |
|
wangliwen
|
6e80f7cdaf
|
重复申请发送通知
|
2022-10-12 15:15:21 +08:00 |
|
lizhicheng
|
57af11a4a0
|
基础设施去掉感知资源分类
|
2022-10-12 11:19:00 +08:00 |
|
wangliwen
|
d947510ebe
|
Merge branch 'dev'
|
2022-10-12 09:57:05 +08:00 |
|
wangliwen
|
6612b514c8
|
模型文案调整
|
2022-10-12 09:56:54 +08:00 |
|
wangliwen
|
388b8f67a0
|
Merge branch 'dev'
|
2022-10-12 09:42:28 +08:00 |
|
wangliwen
|
5bff2763a9
|
审批详情——市级区市管理员——改为市级管理员 HIQDUCS-17
|
2022-10-12 09:42:18 +08:00 |
|
wangliwen
|
5fb69dc48c
|
Merge branch 'dev'
|
2022-10-11 19:59:21 +08:00 |
|
wangliwen
|
6857ccb90e
|
npe
|
2022-10-11 19:59:14 +08:00 |
|
wangliwen
|
8cb99adfc4
|
Merge branch 'dev'
|
2022-10-11 19:48:14 +08:00 |
|
wangliwen
|
bc4a0f6635
|
。。。
|
2022-10-11 19:48:06 +08:00 |
|
wangliwen
|
1634cb4aad
|
Merge branch 'dev'
|
2022-10-11 19:36:14 +08:00 |
|
wangliwen
|
2c40cace07
|
审批详情返回分配人的所属部门
|
2022-10-11 19:36:06 +08:00 |
|
wangliwen
|
55e85e86f0
|
Merge branch 'dev'
|
2022-10-11 17:45:19 +08:00 |
|
lizhicheng
|
50fed6862d
|
消息通知跳转完善
|
2022-10-11 16:19:47 +08:00 |
|
lizhicheng
|
894c5c0251
|
报表统计bug、会议室消息跳转
|
2022-10-11 11:49:22 +08:00 |
|
wangliwen
|
7ab1ce6c77
|
Merge remote-tracking branch 'origin/dev'
|
2022-10-10 14:13:06 +08:00 |
 dinggang
|
e217f56ca9
|
修改能力统计页申请次数统计不一致问题
|
2022-10-10 14:08:26 +08:00 |
|
wangliwen
|
21ac7f2991
|
Merge branch 'dev'
|
2022-10-10 13:53:45 +08:00 |
|
zhangzhikang
|
d62484ba62
|
会议室预约审批人角色改为会议室审核人,增加根据roleid查询所有userId的方法，会议室改为发送角色下的所有人
|
2022-10-10 10:50:52 +08:00 |
|
wangliwen
|
2538479e36
|
Merge branch 'dev'
|
2022-10-10 10:16:36 +08:00 |
|
zhangzhikang
|
7169d9ee73
|
会议室预约审批人角色改为会议室审核人
|
2022-10-10 10:12:17 +08:00 |
|
wangliwen
|
53725af1b2
|
Merge branch 'dev'
|
2022-10-10 09:50:47 +08:00 |
|
wangliwen
|
f72463d3bf
|
部门审批人为发起人时 默认通过
|
2022-10-10 09:50:28 +08:00 |
|
wangliwen
|
1190beb8fe
|
Merge branch 'dev'
|
2022-10-09 18:09:24 +08:00 |
|
lizhicheng
|
bb9d5847bf
|
完善：西海岸申购车
|
2022-10-09 17:20:03 +08:00 |
|
wangliwen
|
06b3086ae3
|
Merge branch 'dev'
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
|
2022-10-09 10:45:40 +08:00 |
|
wangliwen
|
77aac95526
|
资源导入
|
2022-10-09 10:43:34 +08:00 |
|
wangliwen
|
286df76ec3
|
Merge branch 'dev'
|
2022-10-09 09:01:38 +08:00 |
|
wangliwen
|
983b01af36
|
全局格式化
|
2022-10-09 09:01:27 +08:00 |
|
wangliwen
|
ec4a84b581
|
Merge branch 'dev'
|
2022-10-09 08:55:42 +08:00 |
|
lizhicheng
|
00eace9698
|
西海岸新增：购物车添加与一键申请
|
2022-10-08 19:03:01 +08:00 |
|
wangliwen
|
3096433c38
|
Merge branch 'dev'
|
2022-10-08 10:55:13 +08:00 |
|
wangliwen
|
a409420df3
|
...
|
2022-10-08 10:55:03 +08:00 |
|
wangliwen
|
dca052dd59
|
Merge branch 'dev'
|
2022-10-08 09:28:35 +08:00 |
|
wangliwen
|
332a2972e4
|
全局格式化代码
|
2022-10-08 09:28:24 +08:00 |
|
DESKTOP-VA9NQUP\liwen
|
7396a0a595
|
Merge branch 'master' into docker_package
|
2022-10-04 22:11:22 +08:00 |