 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 |
|
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 |
|
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 |
|
wangliwen
|
950f3f3b6e
|
...
|
2022-09-26 16:35:41 +08:00 |
|
wangliwen
|
c67274cf51
|
Merge branch 'master' into docker_package
|
2022-09-26 16:25:53 +08:00 |
|
wangliwen
|
21a56a4d26
|
...
|
2022-09-26 16:25:38 +08:00 |
|
wangliwen
|
736d815f68
|
Merge branch 'master' into docker_package
|
2022-09-26 16:08:19 +08:00 |
|
wangliwen
|
0e4c61cda1
|
能力申请增加当前节点信息
|
2022-09-26 16:07:28 +08:00 |
|
wangliwen
|
48c80cb357
|
能力申请通知调整
|
2022-09-26 15:39:40 +08:00 |
|
wangliwen
|
84fc633381
|
Merge branch 'master' into docker_package
|
2022-09-26 14:22:17 +08:00 |
|
wangliwen
|
5edf6803e9
|
...
|
2022-09-26 14:21:46 +08:00 |
|
wangliwen
|
aaf7324d98
|
Merge branch 'master' into docker_package
|
2022-09-23 18:04:36 +08:00 |
|
lizhicheng
|
c64c3b4278
|
统计报表修改
|
2022-09-23 17:42:43 +08:00 |
|
wangliwen
|
8f497f7b29
|
Merge branch 'master' into docker_package
|
2022-09-23 09:49:02 +08:00 |
|
lizhicheng
|
4aab62391a
|
西海岸bug修复
|
2022-09-23 09:17:41 +08:00 |
|
wangliwen
|
e32725c2aa
|
Merge branch 'master' into docker_package
|
2022-09-22 09:16:45 +08:00 |
|
lizhicheng
|
51682736e6
|
新增功能：无人机、单兵设备审批
|
2022-09-21 21:57:38 +08:00 |
|
wangliwen
|
b871304d86
|
Merge branch 'master' into docker_package
|
2022-09-20 13:55:41 +08:00 |
|
lizhicheng
|
98ae1d69bd
|
云脑群网关统计对接
|
2022-09-20 13:05:08 +08:00 |
|
wangliwen
|
c8589edb41
|
Merge branch 'master' into docker_package
|
2022-09-20 10:36:30 +08:00 |
|
lizhicheng
|
ffa1ebc9f7
|
西海岸需求：通知消息体现资源
|
2022-09-20 10:25:11 +08:00 |
|
wangliwen
|
e90976b781
|
Merge branch 'master' into docker_package
|
2022-09-19 11:49:20 +08:00 |
|
wangliwen
|
347961cbd2
|
...
|
2022-09-19 11:49:06 +08:00 |
|
wangliwen
|
2f4aeb75dc
|
Merge branch 'master' into docker_package
|
2022-09-19 11:06:29 +08:00 |
|
wangliwen
|
8b8d155bc2
|
/resource/selectAppList 接口增加参数 area
|
2022-09-19 11:06:03 +08:00 |
|
wangliwen
|
f5118dc89c
|
Merge branch 'master' into docker_package
|
2022-09-16 14:35:46 +08:00 |
|
wangliwen
|
cda3c4968a
|
...
|
2022-09-16 14:35:30 +08:00 |
|
wangliwen
|
d3dde53310
|
Merge branch 'master' into docker_package
|
2022-09-16 14:21:16 +08:00 |
|
wangliwen
|
a0508e76ff
|
...
|
2022-09-16 14:21:00 +08:00 |
|
wangliwen
|
f9dca3b8fb
|
Merge branch 'master' into docker_package
|
2022-09-16 11:45:59 +08:00 |
|
wangliwen
|
71611ec1d6
|
npe
|
2022-09-16 11:45:14 +08:00 |
|
wangliwen
|
5c90ce83ba
|
Merge branch 'master' into docker_package
|
2022-09-16 10:53:34 +08:00 |
|
wangliwen
|
8e5648b964
|
能力申请前端传用户部门id时，更新用户部门id（存在用户原有部门被删除的情况 屮）
|
2022-09-16 10:53:17 +08:00 |
|
wangliwen
|
3a3ccaa356
|
Merge branch 'master' into docker_package
|
2022-09-15 09:23:24 +08:00 |
|
DESKTOP-VA9NQUP\liwen
|
5c45acdffa
|
Merge branch 'master' into docker_package
|
2022-09-14 22:11:41 +08:00 |
|
lizhicheng
|
e539922487
|
申请、上架全局统计优化
|
2022-09-14 19:38:51 +08:00 |
|
lizhicheng
|
4e027e9f04
|
新增上架、申请详情统计
|
2022-09-14 17:09:13 +08:00 |
 huangweixiong
|
7cbdb1c555
|
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:
新增上架统计api
新增统计api
|
2022-09-14 17:05:58 +08:00 |
|
huangweixiong
|
b8e3884c6d
|
修改亚威通知字段
|
2022-09-14 17:05:15 +08:00 |
|
lizhicheng
|
3f0f344d5b
|
新增上架统计api
按照部门、能力类型、组件类型统计能力上架情况
|
2022-09-14 14:19:50 +08:00 |
|
wangliwen
|
cccb0b4a59
|
Merge branch 'master' into docker_package
|
2022-09-13 18:03:42 +08:00 |
|
lizhicheng
|
c3541440c5
|
新增统计api
按照部门、能力类型、组件类型统计能力使用情况
|
2022-09-13 17:42:50 +08:00 |
|
huangweixiong
|
3c8d2d6ccd
|
人员同步添加日志
|
2022-09-13 14:51:49 +08:00 |
|
wangliwen
|
b58d8799d8
|
Merge branch 'master' into docker_package
|
2022-09-13 09:44:16 +08:00 |
|
wangliwen
|
df7da72a99
|
...
|
2022-09-13 09:44:00 +08:00 |
|
wangliwen
|
e380179a6d
|
Merge branch 'master' into docker_package
|
2022-09-08 17:00:38 +08:00 |
|
wangliwen
|
9a0c01619e
|
屮
|
2022-09-08 17:00:21 +08:00 |
|
wangliwen
|
4467a80b7a
|
Merge branch 'master' into docker_package
|
2022-09-08 10:33:57 +08:00 |
|
lizhicheng
|
3c51f94840
|
云脑群网关代码优化
|
2022-09-08 10:31:48 +08:00 |
|
lizhicheng
|
3da00d0ce9
|
添加网关配置项
|
2022-09-08 10:30:17 +08:00 |
|
wangliwen
|
4d9b0b9fbe
|
Merge branch 'master' into docker_package
|
2022-09-07 18:08:55 +08:00 |
|
lizhicheng
|
866bbd1faf
|
融合服务：新增申请量统计功能
|
2022-09-07 15:42:00 +08:00 |
|
lizhicheng
|
2a453b02d8
|
云脑群网关接入
|
2022-09-07 13:46:14 +08:00 |
|
wangliwen
|
a8a78e08bf
|
Merge branch 'master' into docker_package
|
2022-09-07 11:31:38 +08:00 |
|
lizhicheng
|
2349aec38e
|
通知消息修改
|
2022-09-07 11:03:35 +08:00 |
|
wangliwen
|
72aaa294b5
|
Merge branch 'master' into docker_package
|
2022-09-05 10:03:26 +08:00 |
|
dinggang
|
2ce9eac65d
|
查询最新能力增加所属部门名称
|
2022-09-05 09:35:55 +08:00 |
|
wangliwen
|
938301a081
|
Merge branch 'master' into docker_package
|
2022-09-02 14:22:50 +08:00 |
|
wangliwen
|
606757b31e
|
npe
|
2022-09-02 14:22:23 +08:00 |
|
wangliwen
|
6bd39f39bd
|
Merge branch 'master' into docker_package
|
2022-09-02 11:33:01 +08:00 |
|
wangliwen
|
9a9d791ae5
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-09-02 11:32:41 +08:00 |
|
wangliwen
|
d143699684
|
...
|
2022-09-02 11:32:15 +08:00 |
|
zhangzhikang
|
2b1bc48814
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-09-02 11:09:11 +08:00 |
|
zhangzhikang
|
4f33fac986
|
0902会议室禅道问题修改
|
2022-09-02 11:08:54 +08:00 |