 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 |
|
lizhicheng
|
117c79eb0d
|
通知消息跳转bug fix
|
2022-10-04 18:01:49 +08:00 |
|
lizhicheng
|
c645e0f177
|
新增功能：通知消息支持跳转
|
2022-10-04 17:34:19 +08:00 |
|
DESKTOP-VA9NQUP\liwen
|
d2a26c959f
|
Merge branch 'master' into docker_package
|
2022-10-03 20:33:27 +08:00 |
|
lizhicheng
|
be042a94b0
|
统计报表新增：审批单号
|
2022-10-03 16:06:42 +08:00 |
|
lizhicheng
|
4a5ef24d0c
|
融合服务场景入口、首页资源统计、已办bug
|
2022-10-03 11:46:20 +08:00 |
|
wangliwen
|
68ecd853d1
|
Merge branch 'master' into docker_package
|
2022-09-30 09:13:29 +08:00 |
|
lizhicheng
|
7163b83c2a
|
新增功能：基础设施部门最大申请限制
|
2022-09-29 23:01:27 +08:00 |
|
wangliwen
|
98f5b5519f
|
Merge branch 'master' into docker_package
|
2022-09-29 17:52:06 +08:00 |
|
wangliwen
|
ea141edbfa
|
全局格式化代码
|
2022-09-29 17:51:37 +08:00 |
|
wangliwen
|
0259a0a1db
|
Merge branch 'master' into docker_package
|
2022-09-29 11:15:28 +08:00 |
|
wangliwen
|
dc7821387c
|
屮
|
2022-09-29 11:15:14 +08:00 |
|
wangliwen
|
92138b1668
|
docker 镜像增加 HEALTHCHECK
|
2022-09-29 10:38:25 +08:00 |
|
wangliwen
|
bdac845f47
|
Merge branch 'master' into docker_package
|
2022-09-29 09:26:11 +08:00 |
|
wangliwen
|
2f933627ff
|
...
|
2022-09-29 09:25:57 +08:00 |
|
wangliwen
|
768e24d62a
|
Merge branch 'master' into docker_package
|
2022-09-28 09:39:43 +08:00 |
|
wangliwen
|
1af6d798ed
|
日志输出采用异步输出模式
|
2022-09-28 09:39:18 +08:00 |
|
DESKTOP-VA9NQUP\liwen
|
ff8ed49979
|
Merge branch 'master' into docker_package
|
2022-09-28 07:54:24 +08:00 |
|
lizhicheng
|
ae3556ac3e
|
西海岸v2申请流程修改
|
2022-09-27 18:55:44 +08:00 |
|
wangliwen
|
0348efcb56
|
Merge branch 'master' into docker_package
|
2022-09-27 17:27:29 +08:00 |
|
lizhicheng
|
1eb11c53ee
|
设备审批增加筛选条件
|
2022-09-27 16:43:20 +08:00 |
|
lizhicheng
|
22eea4c2f5
|
bug fix
|
2022-09-27 16:10:42 +08:00 |
|
wangliwen
|
c5aaeca724
|
Merge branch 'master' into docker_package
|
2022-09-27 11:04:53 +08:00 |
|
lizhicheng
|
3c0d9ab8b3
|
新增：申请过期时间
|
2022-09-27 09:52:16 +08:00 |
|
wangliwen
|
1b7825b3d6
|
Merge branch 'master' into docker_package
|
2022-09-26 17:16:07 +08:00 |
|
wangliwen
|
57f73108ea
|
所有流程流转增加当前流程节点
|
2022-09-26 17:15:52 +08:00 |
|
wangliwen
|
0a17e588eb
|
Merge branch 'master' into docker_package
|
2022-09-26 16:51:11 +08:00 |
|
wangliwen
|
3826cdae37
|
处理人
|
2022-09-26 16:50:59 +08:00 |
|
wangliwen
|
c98509adc0
|
Merge branch 'master' into docker_package
|
2022-09-26 16:39:55 +08:00 |
|
wangliwen
|
128653d837
|
屮
|
2022-09-26 16:39:43 +08:00 |
|
wangliwen
|
16ee9172be
|
Merge branch 'master' into docker_package
|
2022-09-26 16:35:54 +08:00 |