wangliwen
|
da86313738
|
Merge branch 'dev'
|
2022-10-25 10:27:40 +08:00 |
wangliwen
|
ab54087d8a
|
调整左侧树缓存时间
|
2022-10-25 10:27:32 +08:00 |
wangliwen
|
0fa6b6fba1
|
Merge branch 'master' into docker_package
|
2022-10-25 10:05:32 +08:00 |
wangliwen
|
ca2de25a26
|
Merge branch 'dev'
|
2022-10-25 10:05:24 +08:00 |
wangliwen
|
00b55a9c6b
|
能力统计增加区域参数
|
2022-10-25 10:05:13 +08:00 |
wangliwen
|
fd7b72d47d
|
Merge branch 'master' into docker_package
|
2022-10-25 09:33:49 +08:00 |
wangliwen
|
ab24e417bd
|
Merge branch 'dev'
|
2022-10-25 09:33:39 +08:00 |
wangliwen
|
1ee75d834d
|
调整dockerfile 启动指令
|
2022-10-25 09:33:20 +08:00 |
huangweixiong
|
cdb7cb3012
|
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:
打包处理
pom文件调整
|
2022-10-25 09:14:05 +08:00 |
lizhicheng
|
4ab4265e19
|
enke:查询用户列表
|
2022-10-24 18:30:44 +08:00 |
wangliwen
|
d372c76c4e
|
Merge branch 'dev'
|
2022-10-24 17:27:21 +08:00 |
wangliwen
|
2104fa597b
|
打包处理
|
2022-10-24 17:27:12 +08:00 |
wangliwen
|
edc669f15a
|
Merge branch 'dev'
|
2022-10-24 15:13:09 +08:00 |
wangliwen
|
6ba7839344
|
pom文件调整
|
2022-10-24 15:12:59 +08:00 |
huangweixiong
|
7040ce1b81
|
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:
...
|
2022-10-24 15:00:54 +08:00 |
wangliwen
|
fcb9390bc7
|
Merge branch 'dev'
|
2022-10-24 14:59:42 +08:00 |
wangliwen
|
bebac3abcf
|
...
|
2022-10-24 14:59:34 +08:00 |
wangliwen
|
5e4fa8fe1b
|
Merge branch 'dev'
|
2022-10-24 14:27:09 +08:00 |
huangweixiong
|
e8b3394d7e
|
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:
enke视频会议
|
2022-10-24 14:26:54 +08:00 |
huangweixiong
|
f358cdf596
|
更新知识库配置文件
|
2022-10-24 14:09:39 +08:00 |
lizhicheng
|
08a2af2b8b
|
enke视频会议
|
2022-10-24 13:59:40 +08:00 |
wangliwen
|
6402a9667d
|
Merge remote-tracking branch 'origin/dev'
|
2022-10-22 10:51:31 +08:00 |
huangweixiong
|
6feb229b22
|
生产环境配置文件
|
2022-10-22 10:48:16 +08:00 |
huangweixiong
|
f0084dc031
|
【修复】消息中心-拼接的审批人为申请人问题
|
2022-10-22 10:47:58 +08:00 |
DESKTOP-VA9NQUP\liwen
|
b14d805a4c
|
Merge branch 'dev'
|
2022-10-21 19:19:02 +08:00 |
dinggang
|
f57a7f3b9c
|
1.门户首页全局搜索加上会议室搜索结果
2.能力使用申请流程到资源所属部门审批节点时去除分配默认的审批人为大数据局审批员时自动通过
|
2022-10-21 17:15:44 +08:00 |
DESKTOP-VA9NQUP\liwen
|
0e2c7b93ae
|
Merge branch 'dev'
|
2022-10-21 14:25:47 +08:00 |
DESKTOP-VA9NQUP\liwen
|
a59b6828bf
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-10-21 14:25:31 +08:00 |
DESKTOP-VA9NQUP\liwen
|
c8d453a94d
|
转办文案调整
|
2022-10-21 14:25:22 +08:00 |
huangweixiong
|
a0c7496d97
|
亚威消息推送
|
2022-10-21 13:43:53 +08:00 |
DESKTOP-VA9NQUP\liwen
|
ef6971f2eb
|
Merge branch 'dev'
|
2022-10-21 12:00:32 +08:00 |
huangweixiong
|
d8821ec1a6
|
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:
统计报表筛选完善
分配到系统默认审核人时,调整通知文案
能力统计各榜单排序逻辑修改
|
2022-10-21 11:49:20 +08:00 |
huangweixiong
|
328b1872e4
|
消息推送将进入对应的待办列表
|
2022-10-21 11:48:38 +08:00 |
DESKTOP-VA9NQUP\liwen
|
b4ea272340
|
Merge branch 'dev'
|
2022-10-21 10:15:38 +08:00 |
lizhicheng
|
8a70790b27
|
统计报表筛选完善
|
2022-10-21 09:56:56 +08:00 |
wangliwen
|
a39f5c84c3
|
Merge branch 'dev'
|
2022-10-20 15:16:13 +08:00 |
wangliwen
|
1700ea0cae
|
分配到系统默认审核人时,调整通知文案
|
2022-10-20 15:16:03 +08:00 |
wangliwen
|
e83f712193
|
Merge branch 'dev'
|
2022-10-20 11:51:38 +08:00 |
dinggang
|
583d6aaee0
|
能力统计各榜单排序逻辑修改
|
2022-10-20 11:50:12 +08:00 |
wangliwen
|
e07f88e2ad
|
Merge branch 'dev'
|
2022-10-20 09:33:13 +08:00 |
wangliwen
|
8c256f315d
|
代码格式化
|
2022-10-20 09:33:01 +08:00 |
wangliwen
|
9c1b01c6d1
|
Merge branch 'dev'
|
2022-10-19 14:04:01 +08:00 |
wangliwen
|
027e493020
|
...
|
2022-10-19 14:03:52 +08:00 |
wangliwen
|
0b9ee53bc8
|
Merge branch 'dev'
|
2022-10-19 11:13:43 +08:00 |
lizhicheng
|
30a4ce6797
|
统计报表加分页
|
2022-10-19 10:16:23 +08:00 |
wangliwen
|
5d0b4bc32d
|
Merge branch 'dev'
|
2022-10-19 08:54:22 +08:00 |
huangweixiong
|
1bcb055baf
|
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:
CIM智能算法改开发组件
|
2022-10-18 17:35:29 +08:00 |
huangweixiong
|
109a2a1f79
|
待办推送格式修改
|
2022-10-18 17:34:59 +08:00 |
wangliwen
|
4245d1c782
|
Merge branch 'dev'
|
2022-10-18 17:22:45 +08:00 |
wangliwen
|
14a9aa33ae
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-10-18 17:22:34 +08:00 |
wangliwen
|
d7f8bf7656
|
Merge branch 'dev'
|
2022-10-18 17:21:41 +08:00 |
lizhicheng
|
317a0d21aa
|
CIM智能算法改开发组件
|
2022-10-18 17:07:46 +08:00 |
huangweixiong
|
b326c8e24b
|
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:
数据异常导出失败
npe
导出表头宽度自适应
调整导出文件名
...
能力统计 导出
CIM组件统计改为开发组件
selectDeptDetailTypeCountList 增加导出接口
npe
会议室重复统计
...
npe
...
能力使用部门排序
屮
...
...
HIQDUCS-100 的处理
设备申请新增设备详情字段
统计报表状态修改
|
2022-10-18 16:41:18 +08:00 |
huangweixiong
|
482e3fd51c
|
修改能力申请的发送通知
|
2022-10-18 16:40:39 +08:00 |
wangliwen
|
488ed3ec33
|
Merge branch 'dev'
|
2022-10-18 15:43:30 +08:00 |
wangliwen
|
f2a1b152a8
|
数据异常导出失败
|
2022-10-18 15:43:22 +08:00 |
wangliwen
|
03a0b43941
|
Merge branch 'dev'
|
2022-10-18 15:21:59 +08:00 |
wangliwen
|
a4047352c1
|
npe
|
2022-10-18 15:21:50 +08:00 |
wangliwen
|
1d16cca31b
|
Merge branch 'dev'
|
2022-10-18 14:38:49 +08:00 |
wangliwen
|
f1d3fea424
|
导出表头宽度自适应
|
2022-10-18 14:38:41 +08:00 |
wangliwen
|
847f1490b8
|
Merge branch 'dev'
|
2022-10-18 13:44:04 +08:00 |
wangliwen
|
094d27fddf
|
调整导出文件名
|
2022-10-18 13:43:54 +08:00 |
wangliwen
|
7499cbf4a0
|
Merge branch 'dev'
|
2022-10-18 11:31:38 +08:00 |
wangliwen
|
fa94eb77f3
|
...
|
2022-10-18 11:31:31 +08:00 |
wangliwen
|
c9c256ff87
|
Merge branch 'dev'
|
2022-10-18 11:18:36 +08:00 |
wangliwen
|
17cd5900f8
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-10-18 11:18:24 +08:00 |
wangliwen
|
020a32519a
|
能力统计 导出
|
2022-10-18 11:18:11 +08:00 |
lizhicheng
|
7c4b941031
|
CIM组件统计改为开发组件
|
2022-10-18 10:00:46 +08:00 |
wangliwen
|
41d382c71a
|
Merge branch 'dev'
|
2022-10-18 09:58:18 +08:00 |
wangliwen
|
c02702e70e
|
selectDeptDetailTypeCountList 增加导出接口
|
2022-10-18 09:58:06 +08:00 |
wangliwen
|
6004a99da7
|
Merge branch 'dev'
|
2022-10-18 09:05:05 +08:00 |
lizhicheng
|
9961970fb1
|
npe
|
2022-10-17 17:56:53 +08:00 |
wangliwen
|
3e54f99052
|
Merge branch 'dev'
|
2022-10-17 16:54:43 +08:00 |
wangliwen
|
5b85df5010
|
会议室重复统计
|
2022-10-17 16:54:25 +08:00 |
wangliwen
|
02893504fc
|
Merge branch 'dev'
|
2022-10-17 16:29:03 +08:00 |
wangliwen
|
a2231e4d11
|
...
|
2022-10-17 16:28:54 +08:00 |
wangliwen
|
6701c763a8
|
Merge branch 'dev'
|
2022-10-17 16:18:20 +08:00 |
wangliwen
|
834fbb9d8c
|
npe
|
2022-10-17 16:18:10 +08:00 |
wangliwen
|
1b9f87b6ff
|
Merge branch 'dev'
|
2022-10-17 16:07:29 +08:00 |
wangliwen
|
c63bff7ef8
|
...
|
2022-10-17 16:07:22 +08:00 |
wangliwen
|
b263804884
|
Merge branch 'dev'
|
2022-10-17 16:04:21 +08:00 |
wangliwen
|
abc082624d
|
能力使用部门排序
|
2022-10-17 16:03:32 +08:00 |
wangliwen
|
cb3e72fd48
|
Merge branch 'dev'
|
2022-10-17 14:15:31 +08:00 |
wangliwen
|
b25309c134
|
屮
|
2022-10-17 14:15:23 +08:00 |
wangliwen
|
23fcf66cd5
|
Merge branch 'dev'
|
2022-10-17 14:07:17 +08:00 |
wangliwen
|
f1c2cbc28e
|
...
|
2022-10-17 14:07:07 +08:00 |
wangliwen
|
67de630ca0
|
Merge branch 'dev'
|
2022-10-17 13:57:35 +08:00 |
wangliwen
|
ad54ba9ac1
|
...
|
2022-10-17 13:56:19 +08:00 |
wangliwen
|
8f6b530a0d
|
Merge branch 'dev'
|
2022-10-17 13:12:47 +08:00 |
wangliwen
|
dd08d7b139
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-10-17 13:12:34 +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
|
a1fbce7737
|
Merge branch 'dev'
|
2022-10-14 11:26:58 +08:00 |
wangliwen
|
b1376f4646
|
发起人主动终止时 补充意见
|
2022-10-14 11:25:58 +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
|
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
|
14768c994a
|
Merge branch 'dev'
|
2022-10-13 22:57:09 +08:00 |
wangliwen
|
7ca30e38c2
|
去掉
|
2022-10-13 22:56:49 +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
|
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
|
2b599faa4a
|
Merge branch 'dev'
|
2022-10-13 21:32:12 +08:00 |
wangliwen
|
f3cb2206cb
|
调整
|
2022-10-13 21:32:01 +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 |
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 |
wangliwen
|
419d5aa258
|
Merge branch 'master' into docker_package
|
2022-09-02 09:20:29 +08:00 |
wangliwen
|
c542c51e5c
|
...
|
2022-09-02 09:20:13 +08:00 |
wangliwen
|
977579bf5b
|
Merge branch 'master' into docker_package
|
2022-09-02 08:58:22 +08:00 |
Koi-tsk
|
087b1ca78f
|
停用账号不分配审批bug修复
|
2022-09-01 17:10:47 +08:00 |
wangliwen
|
f2039ed918
|
Merge branch 'master' into docker_package
|
2022-09-01 17:05:11 +08:00 |
wangliwen
|
7865ebbd27
|
能力申请V3 免批判断
|
2022-09-01 17:04:09 +08:00 |
wangliwen
|
aa898827b7
|
Merge branch 'master' into docker_package
|
2022-09-01 13:48:56 +08:00 |
wangliwen
|
f3a155c44d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-09-01 13:48:11 +08:00 |
wangliwen
|
82a96dba99
|
...
|
2022-09-01 13:47:55 +08:00 |
dinggang
|
7bdbc7dcb1
|
编目更新
|
2022-09-01 11:51:48 +08:00 |
wangliwen
|
3359e7c0ca
|
Merge branch 'master' into docker_package
|
2022-08-31 18:50:09 +08:00 |
zhangzhikang
|
28f4558fa6
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-31 18:27:44 +08:00 |
zhangzhikang
|
9c7470a123
|
0831会议室禅道问题修改
|
2022-08-31 18:27:31 +08:00 |
wangliwen
|
658f773dfe
|
Merge branch 'master' into docker_package
|
2022-08-31 16:54:38 +08:00 |
wangliwen
|
e251ae518f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-31 16:54:09 +08:00 |
wangliwen
|
be6968c78f
|
发送消息到亚微
|
2022-08-31 16:53:43 +08:00 |
yitonglei
|
82ca10d9eb
|
no message
|
2022-08-31 16:19:43 +08:00 |
wangliwen
|
ed29d6e0fb
|
Merge branch 'master' into docker_package
|
2022-08-31 16:11:37 +08:00 |
yitonglei
|
cdca90474d
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-31 15:48:50 +08:00 |
yitonglei
|
aa9f756f2c
|
添加注释,并删掉无用的注释
|
2022-08-31 15:48:15 +08:00 |
wangliwen
|
a2f3c79cee
|
Merge branch 'master' into docker_package
|
2022-08-31 15:39:07 +08:00 |
Koi-tsk
|
c62cfc25a6
|
自动审批通过的节点不发消息
|
2022-08-31 15:31:01 +08:00 |
wangliwen
|
9f78638ab7
|
Merge branch 'master' into docker_package
|
2022-08-31 15:19:57 +08:00 |
yitonglei
|
d452ddb4fb
|
修改从金宏网获取用户的方法,增加自动任务调度功能
|
2022-08-31 13:50:46 +08:00 |
wangliwen
|
a7489a8033
|
Merge branch 'master' into docker_package
|
2022-08-31 09:48:08 +08:00 |
wangliwen
|
ce1bce47c5
|
...
|
2022-08-31 09:47:46 +08:00 |
wangliwen
|
b015025c40
|
Merge branch 'master' into docker_package
|
2022-08-30 15:21:12 +08:00 |
wangliwen
|
c7adca34bd
|
使用索引替换
|
2022-08-30 15:20:35 +08:00 |
wangliwen
|
c002b0c0c5
|
Merge branch 'master' into docker_package
|
2022-08-30 13:30:47 +08:00 |
wangliwen
|
f95d2d0157
|
...
|
2022-08-30 13:30:28 +08:00 |
wangliwen
|
ae906d2331
|
Merge branch 'master' into docker_package
|
2022-08-30 13:03:51 +08:00 |
wangliwen
|
35f004a75d
|
...
|
2022-08-30 13:03:34 +08:00 |
wangliwen
|
0701c6fa67
|
Merge branch 'master' into docker_package
|
2022-08-30 12:55:16 +08:00 |
wangliwen
|
b3074d25ad
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-30 12:54:56 +08:00 |
wangliwen
|
77099bd434
|
是否申请的状态
|
2022-08-30 12:54:42 +08:00 |
Koi-tsk
|
795d890cd6
|
1.停用用户不分配审批
2.连续重复只审批一次
|
2022-08-30 11:50:40 +08:00 |
wangliwen
|
7f08cb7922
|
Merge branch 'master' into docker_package
|
2022-08-30 11:30:43 +08:00 |
wangliwen
|
fb95b0cfa7
|
...
|
2022-08-30 11:30:24 +08:00 |
wangliwen
|
f45492ee70
|
Merge branch 'master' into docker_package
|
2022-08-30 10:41:24 +08:00 |
wangliwen
|
d8e44a1f49
|
...
|
2022-08-30 10:41:01 +08:00 |
wangliwen
|
5f4118997f
|
Merge branch 'master' into docker_package
|
2022-08-30 10:08:49 +08:00 |
wangliwen
|
b835ce3f73
|
知识库左边树数据异常
|
2022-08-30 10:08:30 +08:00 |
wangliwen
|
afabcc911b
|
Merge branch 'master' into docker_package
|
2022-08-29 11:36:04 +08:00 |
Koi-tsk
|
13934c1da9
|
融合服务-数据资源bug修复
|
2022-08-29 10:08:10 +08:00 |
wangliwen
|
1a538c24c3
|
Merge remote-tracking branch 'origin/dev' into docker_package
|
2022-08-26 18:35:32 +08:00 |
yitonglei
|
0f20088c46
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-26 18:29:47 +08:00 |
yitonglei
|
664a22ce4b
|
no message
|
2022-08-26 18:28:08 +08:00 |
Koi-tsk
|
c2a949ad13
|
融合服务-数据资源暂时注释
|
2022-08-26 18:16:34 +08:00 |
yitonglei
|
246bc4b4df
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-26 17:59:37 +08:00 |
yitonglei
|
0bfef296ab
|
从金宏获取用户增加更新能力
|
2022-08-26 17:59:02 +08:00 |
huangweixiong
|
73b02e3ce6
|
视频token失效重试
|
2022-08-26 17:56:13 +08:00 |
wangliwen
|
a53c7b615f
|
Merge branch 'master' into docker_package
|
2022-08-26 17:53:18 +08:00 |
huangweixiong
|
12861d1c24
|
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:
v3审批:当前审批与申请人一样,默认通过
融合服务修改
删除不需要的注释
。。。
|
2022-08-26 17:39:32 +08:00 |
huangweixiong
|
1e321145ac
|
视频流token失效重试
|
2022-08-26 17:39:19 +08:00 |
wangliwen
|
85a65c9167
|
Merge branch 'master' into docker_package
|
2022-08-26 16:33:16 +08:00 |
Koi-tsk
|
fdc9019a4b
|
v3审批:当前审批与申请人一样,默认通过
|
2022-08-26 16:26:18 +08:00 |
Koi-tsk
|
ffe1b86a28
|
融合服务修改
|
2022-08-26 14:47:55 +08:00 |
wangliwen
|
d38ed565a5
|
Merge branch 'master' into docker_package
|
2022-08-26 14:12:44 +08:00 |
wangliwen
|
2590638c22
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-26 14:12:23 +08:00 |
wangliwen
|
8ce17a5601
|
。。。
|
2022-08-26 14:12:13 +08:00 |
huangweixiong
|
951923b551
|
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:
同步知识库问题
。。。
user表新增字段
融合服务修改
修改获从金宏网获取用户信息,但是还是获取不到guid
同步知识库的优化
能力申请v3-bug fix
...
...
调整跨区判断
更新能力申请模型v3
接口开启gzip压缩
区、市监听器:修改表单字段获取逻辑
applyState 字段返回值不一致的问题fix
npe fix
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/sys/entity/SysUserEntity.java
|
2022-08-26 13:47:12 +08:00 |
huangweixiong
|
bf8a701e57
|
金宏待办推送对接
|
2022-08-26 13:44:04 +08:00 |
wangliwen
|
32eb5b2c8c
|
Merge branch 'master' into docker_package
|
2022-08-26 13:42:55 +08:00 |
wangliwen
|
841cb32035
|
同步知识库问题
|
2022-08-26 11:36:42 +08:00 |
wangliwen
|
5727a36b3f
|
。。。
|
2022-08-26 11:27:37 +08:00 |
wangliwen
|
5c3649f8bd
|
Merge branch 'master' into docker_package
|
2022-08-26 11:05:48 +08:00 |
yitonglei
|
1f6438086c
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-26 11:03:23 +08:00 |
yitonglei
|
e7ce6d3a1c
|
user表新增字段
|
2022-08-26 11:02:03 +08:00 |
wangliwen
|
f17e8be5cc
|
Merge branch 'master' into docker_package
|
2022-08-26 10:48:29 +08:00 |
Koi-tsk
|
1336f6d5e4
|
融合服务修改
|
2022-08-26 10:37:20 +08:00 |
yitonglei
|
2d403dcc9e
|
修改获从金宏网获取用户信息,但是还是获取不到guid
|
2022-08-26 09:05:38 +08:00 |
wangliwen
|
cc4049e777
|
Merge branch 'master' into docker_package
|
2022-08-25 17:55:44 +08:00 |
wangliwen
|
70c706ba73
|
同步知识库的优化
|
2022-08-25 17:55:27 +08:00 |
wangliwen
|
04ed31cd91
|
Merge branch 'master' into docker_package
|
2022-08-25 15:15:36 +08:00 |
Koi-tsk
|
30b5ee12f0
|
能力申请v3-bug fix
|
2022-08-25 14:52:20 +08:00 |
wangliwen
|
9c01ddfa23
|
Merge branch 'master' into docker_package
|
2022-08-25 14:00:35 +08:00 |
wangliwen
|
f4939b34f4
|
...
|
2022-08-25 14:00:11 +08:00 |
wangliwen
|
a080184d70
|
Merge branch 'master' into docker_package
|
2022-08-25 13:31:51 +08:00 |
wangliwen
|
a87bb573e9
|
...
|
2022-08-25 13:31:30 +08:00 |
wangliwen
|
26f551c61e
|
Merge branch 'master' into docker_package
|
2022-08-25 10:00:28 +08:00 |
wangliwen
|
6a306a8a13
|
调整跨区判断
|
2022-08-25 10:00:13 +08:00 |
wangliwen
|
2d18bcbe58
|
Merge branch 'master' into docker_package
|
2022-08-25 09:00:43 +08:00 |
wangliwen
|
12393ec5cc
|
更新能力申请模型v3
|
2022-08-25 09:00:21 +08:00 |
wangliwen
|
cf513627b2
|
Merge branch 'master' into docker_package
|
2022-08-24 18:54:37 +08:00 |
wangliwen
|
94c012ee44
|
Merge branch 'dev'
|
2022-08-24 18:54:11 +08:00 |
wangliwen
|
515ad62bd6
|
接口开启gzip压缩
|
2022-08-24 18:53:52 +08:00 |
lizhicheng
|
e1d1d964ab
|
区、市监听器:修改表单字段获取逻辑
|
2022-08-24 18:10:21 +08:00 |
wangliwen
|
9747d50be0
|
Merge branch 'master' into docker_package
|
2022-08-24 17:13:46 +08:00 |
wangliwen
|
738208ba2e
|
applyState 字段返回值不一致的问题fix
|
2022-08-24 17:13:10 +08:00 |
wangliwen
|
6da1b5b6b1
|
npe fix
|
2022-08-24 16:22:02 +08:00 |
wangliwen
|
be82f34ad1
|
Merge branch 'master' into docker_package
|
2022-08-24 15:57:49 +08:00 |
huangweixiong
|
9b2d222ebf
|
修改日志输出级别
|
2022-08-24 15:30:56 +08:00 |
huangweixiong
|
16c0d2ad69
|
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: (32 commits)
编目更新
...
...
能力申请v3 未查到审批人时,使用配置文件预设默认审核人
...
区、市审批流程监听器完善
能力申请模型更新
...
能力申请v3 新增监听器
...
npe
java.lang.NumberFormatException
修改getImgServices的子查询sql语句为兼容mysql5.7
修改sql
。。
增加能力申请V3 模型
整理代码
...
cim 根据应用领域查询图层服务 和 查询智能算法组件
1.cim模块统计查询及列表查询 2.编目及字典更新
...
|
2022-08-24 15:01:16 +08:00 |
huangweixiong
|
4c7df1cfb4
|
监控视频失效重试
|
2022-08-24 15:00:59 +08:00 |
huangweixiong
|
55e3b4a44e
|
网关重启适配
|
2022-08-24 15:00:40 +08:00 |
wangliwen
|
0d63eec758
|
Merge branch 'master' into docker_package
|
2022-08-24 13:39:50 +08:00 |
dinggang
|
0ac54c1207
|
编目更新
|
2022-08-24 10:37:25 +08:00 |
wangliwen
|
b83db53c6a
|
Merge branch 'master' into docker_package
|
2022-08-24 09:33:43 +08:00 |
wangliwen
|
b41e48528d
|
...
|
2022-08-24 09:33:27 +08:00 |
wangliwen
|
8b182edada
|
Merge branch 'master' into docker_package
|
2022-08-23 11:50:45 +08:00 |
wangliwen
|
2e79af48c1
|
...
|
2022-08-23 11:50:28 +08:00 |
wangliwen
|
5aa5ac0e37
|
Merge branch 'master' into docker_package
|
2022-08-23 10:32:54 +08:00 |
wangliwen
|
6e7f17b48a
|
能力申请v3 未查到审批人时,使用配置文件预设默认审核人
|
2022-08-23 10:32:38 +08:00 |
wangliwen
|
1bca2163f3
|
Merge branch 'master' into docker_package
|
2022-08-22 18:21:29 +08:00 |
wangliwen
|
09e2c34e31
|
...
|
2022-08-22 18:21:16 +08:00 |
wangliwen
|
e77bd6fa11
|
Merge branch 'master' into docker_package
|
2022-08-22 18:08:45 +08:00 |
Koi-tsk
|
c5ab16e7f9
|
区、市审批流程监听器完善
|
2022-08-22 17:59:18 +08:00 |
wangliwen
|
5ed9fdba9e
|
Merge branch 'master' into docker_package
|
2022-08-22 16:44:44 +08:00 |
wangliwen
|
d4c88b8d20
|
能力申请模型更新
|
2022-08-22 16:44:30 +08:00 |
wangliwen
|
95152006e7
|
Merge branch 'master' into docker_package
|
2022-08-22 13:59:55 +08:00 |
wangliwen
|
e88e596699
|
...
|
2022-08-22 13:59:40 +08:00 |
wangliwen
|
2c063fb813
|
Merge branch 'master' into docker_package
|
2022-08-22 11:33:29 +08:00 |
wangliwen
|
183a64c7ac
|
能力申请v3 新增监听器
|
2022-08-22 11:32:47 +08:00 |
huangweixiong
|
c51e335f9f
|
网关重启适配
|
2022-08-22 11:11:02 +08:00 |
wangliwen
|
31367f9789
|
Merge branch 'master' into docker_package
|
2022-08-22 10:38:12 +08:00 |
wangliwen
|
9abb064ece
|
...
|
2022-08-22 10:37:58 +08:00 |
wangliwen
|
3e18ec9b8e
|
Merge branch 'master' into docker_package
|
2022-08-22 10:14:36 +08:00 |
wangliwen
|
81db400dec
|
npe
|
2022-08-22 10:14:22 +08:00 |
wangliwen
|
cad9bf4ae0
|
Merge branch 'master' into docker_package
|
2022-08-22 09:54:39 +08:00 |
wangliwen
|
28e28430f0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-22 09:54:25 +08:00 |
wangliwen
|
857681bcac
|
java.lang.NumberFormatException
|
2022-08-22 09:54:00 +08:00 |
yitonglei
|
26ee20e34c
|
修改getImgServices的子查询sql语句为兼容mysql5.7
|
2022-08-22 09:01:26 +08:00 |
wangliwen
|
305183cf9f
|
Merge branch 'master' into docker_package
|
2022-08-19 17:09:44 +08:00 |
yitonglei
|
b428b74e90
|
修改sql
|
2022-08-19 16:25:52 +08:00 |
dinggang
|
f65347f39f
|
。。
|
2022-08-19 16:02:56 +08:00 |
wangliwen
|
22f897ddb9
|
Merge branch 'master' into docker_package
|
2022-08-19 15:53:52 +08:00 |
wangliwen
|
aa3a132421
|
Merge branch 'master' into dev
|
2022-08-19 15:53:32 +08:00 |
wangliwen
|
1816f2b9de
|
增加能力申请V3 模型
|
2022-08-19 15:53:08 +08:00 |
yitonglei
|
f1d87b3907
|
整理代码
|
2022-08-19 14:35:56 +08:00 |
wangliwen
|
fcfff400fc
|
Merge branch 'master' into docker_package
|
2022-08-19 14:22:39 +08:00 |
wangliwen
|
1f7a61a601
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-19 14:22:19 +08:00 |
wangliwen
|
999c265c7e
|
...
|
2022-08-19 14:22:10 +08:00 |
yitonglei
|
e503565a85
|
cim 根据应用领域查询图层服务 和 查询智能算法组件
|
2022-08-19 14:11:06 +08:00 |
dinggang
|
6dcee405c5
|
1.cim模块统计查询及列表查询
2.编目及字典更新
|
2022-08-19 11:59:05 +08:00 |
wangliwen
|
29a5dffb65
|
Merge branch 'master' into docker_package
|
2022-08-19 11:29:40 +08:00 |
wangliwen
|
f4418bae13
|
能力申请V3 批量进行能力申请
|
2022-08-19 11:29:23 +08:00 |
wangliwen
|
151a34f456
|
Merge branch 'master' into docker_package
|
2022-08-19 11:21:09 +08:00 |
wangliwen
|
13db3a21bc
|
能力申请V3补充
|
2022-08-19 11:20:53 +08:00 |
wangliwen
|
bc760323fa
|
Merge branch 'master' into docker_package
|
2022-08-19 10:04:28 +08:00 |
wangliwen
|
08c05a2a55
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-19 10:04:04 +08:00 |
wangliwen
|
ea21ee8c76
|
Merge branch 'master' into docker_package
|
2022-08-19 10:03:24 +08:00 |
dinggang
|
a20fd1f5c8
|
cim模块
|
2022-08-19 10:03:14 +08:00 |
wangliwen
|
633339f64b
|
能力申请 V3
|
2022-08-19 10:03:06 +08:00 |
wangliwen
|
43cd2c492a
|
Merge branch 'master' into docker_package
|
2022-08-18 18:14:23 +08:00 |
wangliwen
|
368d78f48f
|
...
|
2022-08-18 18:14:08 +08:00 |
wangliwen
|
fc11b15fbf
|
Merge branch 'master' into docker_package
|
2022-08-18 14:53:58 +08:00 |
wangliwen
|
92542c2ad8
|
TODO 调整
|
2022-08-18 14:53:41 +08:00 |
wangliwen
|
069a42e0c0
|
...
|
2022-08-18 10:17:46 +08:00 |
wangliwen
|
7fccba5008
|
Merge branch 'master' into docker_package
|
2022-08-18 10:01:26 +08:00 |
wangliwen
|
964bf55f12
|
TODO abilityprocess_v3 能力申请流程的发起
|
2022-08-18 10:01:04 +08:00 |
wangliwen
|
00592c3242
|
Merge branch 'master' into docker_package
|
2022-08-17 18:09:43 +08:00 |
Koi-tsk
|
617ecd64c8
|
初步完成区、市审批流程监听器
|
2022-08-17 17:41:55 +08:00 |
wangliwen
|
8337e4320d
|
Merge branch 'master' into docker_package
|
2022-08-17 16:27:24 +08:00 |
wangliwen
|
4446657af2
|
500了
|
2022-08-17 16:27:11 +08:00 |
wangliwen
|
806dcb3d80
|
Merge branch 'master' into docker_package
|
2022-08-17 16:04:35 +08:00 |
wangliwen
|
0eb62c0885
|
增加下架附件文件名
|
2022-08-17 16:04:23 +08:00 |
wangliwen
|
0b0278a9fb
|
Merge branch 'master' into docker_package
|
2022-08-17 15:44:38 +08:00 |
wangliwen
|
4028588ea7
|
下架新增录入字段
|
2022-08-17 15:43:27 +08:00 |
wangliwen
|
f5c66771be
|
Merge branch 'master' into docker_package
|
2022-08-17 11:17:08 +08:00 |
wangliwen
|
b7ce167d5f
|
增加取消置顶接口
|
2022-08-17 11:16:34 +08:00 |
wangliwen
|
37adee5850
|
Merge branch 'master' into docker_package
|
2022-08-17 11:05:59 +08:00 |
huangweixiong
|
9bcdd78bae
|
网关重启适配
|
2022-08-17 11:04:49 +08:00 |
wangliwen
|
45cf2f747f
|
Merge branch 'master' into docker_package
|
2022-08-17 11:02:43 +08:00 |
huangweixiong
|
98a18a1ddd
|
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: (25 commits)
置顶存在缓存
...
会议室预约的表描述字段扩增
菜单新增会议室
会议室预约的新增表
能力广场和能力集市资源排序按指定方式排序修改 门户首页最新,最热查询排除知识库
total 排序将置顶放前面
...
能力广场和能力集市资源排序按指定方式排序
npe
...
npe
npe
归并为一个排序
屮
...
...
屮
stream 的排序模式
。。。
...
|
2022-08-17 11:01:16 +08:00 |
huangweixiong
|
ebe3d33994
|
适配网关重启
|
2022-08-17 11:00:59 +08:00 |
wangliwen
|
5d83ef8fd2
|
Merge branch 'master' into docker_package
|
2022-08-17 10:17:21 +08:00 |
wangliwen
|
1f7d1e69db
|
置顶存在缓存
|
2022-08-17 10:17:02 +08:00 |
wangliwen
|
5c1a887024
|
Merge branch 'master' into docker_package
|
2022-08-17 09:13:27 +08:00 |
wangliwen
|
afbfd42c07
|
...
|
2022-08-17 09:13:05 +08:00 |
zhangzhikang
|
3697fbf5ee
|
会议室预约的表描述字段扩增
|
2022-08-16 17:39:34 +08:00 |
wangliwen
|
6470c2e3fb
|
Merge branch 'master' into docker_package
|
2022-08-16 17:35:57 +08:00 |
wangliwen
|
74888c915b
|
Merge branch 'master' into docker_package
|
2022-08-16 14:00:10 +08:00 |
dinggang
|
1e5231a197
|
菜单新增会议室
|
2022-08-16 13:59:13 +08:00 |
zhangzhikang
|
b780ea9ad8
|
会议室预约的新增表
|
2022-08-16 14:02:48 +08:00 |
wangliwen
|
16a06c51a5
|
Merge branch 'master' into docker_package
|
2022-08-16 10:55:17 +08:00 |
dinggang
|
408baba4af
|
能力广场和能力集市资源排序按指定方式排序修改
门户首页最新,最热查询排除知识库
|
2022-08-16 10:26:47 +08:00 |
wangliwen
|
4b657ea0d3
|
Merge branch 'master' into docker_package
|
2022-08-16 10:18:15 +08:00 |
wangliwen
|
42d7d1a27c
|
total 排序将置顶放前面
|
2022-08-16 10:17:37 +08:00 |
wangliwen
|
367a70209c
|
Merge branch 'master' into docker_package
|
2022-08-15 18:56:34 +08:00 |
wangliwen
|
4000c2d30e
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-15 18:56:17 +08:00 |
wangliwen
|
fb1eaef889
|
...
|
2022-08-15 18:56:04 +08:00 |
dinggang
|
9e362f3ae9
|
能力广场和能力集市资源排序按指定方式排序
|
2022-08-15 18:55:05 +08:00 |
wangliwen
|
e93234e7ec
|
Merge branch 'master' into docker_package
|
2022-08-15 18:45:20 +08:00 |
wangliwen
|
8574f26607
|
npe
|
2022-08-15 18:44:57 +08:00 |
wangliwen
|
64d7563cb2
|
Merge branch 'master' into docker_package
|
2022-08-15 18:37:23 +08:00 |
wangliwen
|
6a9ae0e939
|
...
|
2022-08-15 18:37:10 +08:00 |
wangliwen
|
b0e7330961
|
Merge branch 'master' into docker_package
|
2022-08-15 18:19:17 +08:00 |
wangliwen
|
469a0d9d32
|
npe
|
2022-08-15 18:18:44 +08:00 |
wangliwen
|
29adf34a3e
|
Merge branch 'master' into docker_package
|
2022-08-15 18:12:32 +08:00 |
wangliwen
|
d79578665f
|
npe
|
2022-08-15 18:12:18 +08:00 |
wangliwen
|
26f194e914
|
Merge branch 'master' into docker_package
|
2022-08-15 18:01:21 +08:00 |
wangliwen
|
d7b4075e7f
|
归并为一个排序
|
2022-08-15 18:01:09 +08:00 |
wangliwen
|
a75dc249c9
|
屮
|
2022-08-15 17:47:33 +08:00 |
wangliwen
|
0e18c338e8
|
Merge branch 'master' into docker_package
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
|
2022-08-15 17:39:45 +08:00 |
wangliwen
|
4fa7825bcd
|
...
|
2022-08-15 17:37:48 +08:00 |
wangliwen
|
3430e57229
|
。。。
|
2022-08-15 17:28:08 +08:00 |
wangliwen
|
b07798e6af
|
。。。
|
2022-08-15 17:16:27 +08:00 |
wangliwen
|
ec9b9cad87
|
Merge branch 'master' into docker_package
|
2022-08-15 17:05:47 +08:00 |
wangliwen
|
6e9868e0f7
|
...
|
2022-08-15 17:05:33 +08:00 |
wangliwen
|
7ef59e72bb
|
Merge branch 'master' into docker_package
|
2022-08-15 16:51:09 +08:00 |
wangliwen
|
4b308ed69f
|
屮
|
2022-08-15 16:50:52 +08:00 |
wangliwen
|
7f8cd71ad1
|
Merge branch 'master' into docker_package
|
2022-08-15 16:34:48 +08:00 |
wangliwen
|
a8cd7f8436
|
stream 的排序模式
|
2022-08-15 16:34:11 +08:00 |
wangliwen
|
1198ca9a09
|
Merge branch 'master' into docker_package
|
2022-08-15 16:11:20 +08:00 |
wangliwen
|
5b63e648e2
|
。。。
|
2022-08-15 16:11:06 +08:00 |
wangliwen
|
37251fa0d8
|
Merge branch 'master' into docker_package
|
2022-08-15 16:03:32 +08:00 |
wangliwen
|
a26819491d
|
屮
|
2022-08-15 16:03:20 +08:00 |
wangliwen
|
00327fc8a1
|
Merge branch 'master' into docker_package
|
2022-08-15 15:47:21 +08:00 |
wangliwen
|
bda6596caa
|
....
|
2022-08-15 15:47:06 +08:00 |
wangliwen
|
7a7c81194e
|
Merge branch 'master' into docker_package
|
2022-08-15 15:30:07 +08:00 |
wangliwen
|
9565b4fe82
|
结果分页的排序
|
2022-08-15 15:29:54 +08:00 |
wangliwen
|
638105a035
|
Merge branch 'master' into docker_package
|
2022-08-15 15:17:13 +08:00 |
wangliwen
|
b3b4ca16a6
|
屮
|
2022-08-15 15:16:59 +08:00 |
wangliwen
|
107ef702b0
|
Merge branch 'master' into docker_package
|
2022-08-15 15:09:18 +08:00 |
wangliwen
|
ce881d43de
|
total排序时,置顶优于total
|
2022-08-15 15:08:20 +08:00 |
huangweixiong
|
ed20fbd0a4
|
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:
补充置顶状态与置顶时间
屮
全局搜索统计各类型能力数量
...
..
..
增加置顶接口
排序修改
sql
...
增加能力置顶字段
parallelStream 使用自定义 ForkJoinPool防止任务堆积
屮
...
...
会议室功能后端开发
|
2022-08-15 14:07:41 +08:00 |
huangweixiong
|
d5ca1cee4c
|
网关配置ip与监控ip分开
|
2022-08-15 14:07:22 +08:00 |
wangliwen
|
e1bf97ff70
|
Merge branch 'master' into docker_package
|
2022-08-15 10:48:24 +08:00 |
wangliwen
|
42f5f3e46a
|
补充置顶状态与置顶时间
|
2022-08-15 10:48:10 +08:00 |
wangliwen
|
cf13470a00
|
Merge branch 'master' into docker_package
|
2022-08-15 10:23:39 +08:00 |
wangliwen
|
61995e999e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-15 10:23:23 +08:00 |
wangliwen
|
5b5ec4d05d
|
屮
|
2022-08-15 10:23:10 +08:00 |
dinggang
|
2241e2808d
|
全局搜索统计各类型能力数量
|
2022-08-15 09:30:39 +08:00 |
wangliwen
|
22a066e319
|
Merge branch 'master' into docker_package
|
2022-08-12 17:48:10 +08:00 |
wangliwen
|
e602317a7a
|
...
|
2022-08-12 17:47:53 +08:00 |
wangliwen
|
9e6b0d4ecd
|
Merge branch 'master' into docker_package
|
2022-08-12 17:37:29 +08:00 |
dinggang
|
c7ff499956
|
..
|
2022-08-12 17:35:04 +08:00 |
wangliwen
|
f33f32161e
|
Merge branch 'master' into docker_package
|
2022-08-12 17:22:24 +08:00 |
dinggang
|
ce07b0ea32
|
..
|
2022-08-12 17:21:35 +08:00 |
wangliwen
|
f823e24e6c
|
Merge branch 'master' into docker_package
|
2022-08-12 17:18:59 +08:00 |
wangliwen
|
81e13e7824
|
Merge branch 'master' into dev
|
2022-08-12 17:18:43 +08:00 |
wangliwen
|
7d4f3cdb57
|
增加置顶接口
|
2022-08-12 17:18:20 +08:00 |
dinggang
|
e51668cc4d
|
排序修改
|
2022-08-12 16:58:35 +08:00 |
wangliwen
|
c6c63b05c5
|
Merge branch 'master' into docker_package
|
2022-08-12 16:30:01 +08:00 |
wangliwen
|
6e7c224109
|
sql
|
2022-08-12 16:29:48 +08:00 |
wangliwen
|
20436f27dc
|
Merge branch 'master' into docker_package
|
2022-08-12 16:26:37 +08:00 |
wangliwen
|
ab11836c23
|
...
|
2022-08-12 16:26:22 +08:00 |
wangliwen
|
d07ec6d360
|
Merge branch 'master' into docker_package
|
2022-08-12 16:13:04 +08:00 |
wangliwen
|
2ccc878eda
|
增加能力置顶字段
|
2022-08-12 16:12:50 +08:00 |
wangliwen
|
4692653705
|
Merge branch 'master' into docker_package
|
2022-08-12 14:11:51 +08:00 |
wangliwen
|
f45e3ea2f4
|
parallelStream 使用自定义 ForkJoinPool防止任务堆积
|
2022-08-12 14:11:34 +08:00 |
wangliwen
|
05f6d8fb5f
|
Merge branch 'master' into docker_package
|
2022-08-12 10:41:29 +08:00 |
wangliwen
|
8980f61b1c
|
屮
|
2022-08-12 10:41:11 +08:00 |
wangliwen
|
32b7d27772
|
Merge branch 'master' into docker_package
|
2022-08-11 14:56:28 +08:00 |
dinggang
|
f6509b5e19
|
...
|
2022-08-11 14:55:20 +08:00 |
wangliwen
|
a27757f18c
|
Merge branch 'master' into docker_package
|
2022-08-11 14:21:53 +08:00 |
dinggang
|
4aee184562
|
...
|
2022-08-11 14:02:35 +08:00 |
wangliwen
|
60e20399c0
|
Merge branch 'master' into docker_package
|
2022-08-11 11:31:35 +08:00 |
zhangzhikang
|
6b98b44d48
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-11 09:27:35 +08:00 |
zhangzhikang
|
e4ba0fcbea
|
会议室功能后端开发
|
2022-08-11 09:20:29 +08:00 |
lizhicheng
|
a01ecfc0fb
|
融合服务接口优化
|
2022-08-10 19:43:17 +08:00 |
dinggang
|
65dc6fae91
|
...
|
2022-08-10 14:02:19 +08:00 |
huangweixiong
|
201a092ed0
|
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:
能力广场-应用资源列表查询
编目更新
|
2022-08-10 11:56:10 +08:00 |
huangweixiong
|
bbefe4fff1
|
增加网关注册接口
|
2022-08-10 11:55:54 +08:00 |
wangliwen
|
4c5d961b65
|
Merge branch 'master' into docker_package
|
2022-08-09 17:11:26 +08:00 |
dinggang
|
0f493bb87c
|
能力广场-应用资源列表查询
|
2022-08-09 16:52:04 +08:00 |
wangliwen
|
d5a0859a1a
|
Merge branch 'master' into docker_package
|
2022-08-09 10:03:59 +08:00 |
dinggang
|
1dee7f1edc
|
编目更新
|
2022-08-09 10:02:53 +08:00 |
wangliwen
|
0d9092ed99
|
Merge branch 'master' into docker_package
|
2022-08-08 18:02:35 +08:00 |
huangweixiong
|
b071097e96
|
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:
管理系统-工作台-部门待办列表查询及部门已办列表查询新增申请用户所在部门及申请内容字段
|
2022-08-08 16:48:12 +08:00 |
huangweixiong
|
51fac0eb09
|
网关测试用接口
|
2022-08-08 16:45:46 +08:00 |
wangliwen
|
f8d3af0dc0
|
Merge branch 'master' into docker_package
|
2022-08-08 16:26:25 +08:00 |
dinggang
|
a94fce5066
|
管理系统-工作台-部门待办列表查询及部门已办列表查询新增申请用户所在部门及申请内容字段
|
2022-08-08 15:36:33 +08:00 |
huangweixiong
|
1e8c970c39
|
能力挂接注册网关
|
2022-08-08 15:17:03 +08:00 |
wangliwen
|
f590c05463
|
Merge branch 'master' into docker_package
|
2022-08-08 14:47:31 +08:00 |
wangliwen
|
f7af710466
|
npe
|
2022-08-08 14:47:15 +08:00 |
wangliwen
|
693fbe9a5b
|
Merge branch 'master' into docker_package
|
2022-08-08 10:46:27 +08:00 |
wangliwen
|
33c2b30a60
|
...
|
2022-08-08 10:46:13 +08:00 |
wangliwen
|
f0eb0e7740
|
Merge branch 'master' into docker_package
|
2022-08-08 09:59:00 +08:00 |
wangliwen
|
c1cd6de9e3
|
屮
|
2022-08-08 09:58:47 +08:00 |
wangliwen
|
f07753a143
|
Merge branch 'master' into docker_package
|
2022-08-08 09:44:12 +08:00 |
wangliwen
|
4d53ef4c99
|
TODO 异步优化
|
2022-08-08 09:43:57 +08:00 |
wangliwen
|
3de584e7e3
|
Merge branch 'master' into docker_package
|
2022-08-06 09:48:59 +08:00 |
wangliwen
|
50696e2617
|
新赋予部门审批人权限用户分配审批去啊权重更大
|
2022-08-06 09:48:45 +08:00 |
wangliwen
|
8d15d7efc9
|
Merge branch 'master' into docker_package
|
2022-08-05 18:06:06 +08:00 |
dinggang
|
e5da46fd4d
|
sql更新
|
2022-08-05 17:34:53 +08:00 |
wangliwen
|
3f2a769542
|
Merge branch 'master' into docker_package
|
2022-08-05 17:15:05 +08:00 |
wangliwen
|
b9a489beac
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-05 17:14:49 +08:00 |
wangliwen
|
16df18cddf
|
异步处理 能力申请
|
2022-08-05 17:14:44 +08:00 |
yitonglei
|
20c73efac5
|
修改ResourceDao.xml的selectByAppArea,增加了条件 AND tda.attr_type = '应用领域'
|
2022-08-05 15:10:27 +08:00 |
wangliwen
|
0d50ad1e4b
|
Merge branch 'master' into docker_package
|
2022-08-05 12:48:21 +08:00 |
wangliwen
|
1047569a77
|
。。。
|
2022-08-05 12:48:03 +08:00 |
wangliwen
|
da785822e0
|
Merge branch 'master' into docker_package
|
2022-08-05 11:56:44 +08:00 |
wangliwen
|
36ad699d38
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-05 11:56:26 +08:00 |
wangliwen
|
c065c04703
|
资源部门被删
|
2022-08-05 11:56:16 +08:00 |
dinggang
|
603d107b65
|
...
|
2022-08-05 10:41:55 +08:00 |
wangliwen
|
45718e5a35
|
Merge branch 'master' into docker_package
|
2022-08-05 10:25:42 +08:00 |
wangliwen
|
0666081fdc
|
Merge branch 'dev'
|
2022-08-05 10:25:20 +08:00 |
wangliwen
|
166fe05195
|
。。。
|
2022-08-05 10:25:00 +08:00 |
dinggang
|
8953cbd867
|
减少日志输出
|
2022-08-05 09:59:47 +08:00 |
wangliwen
|
d3f92adacc
|
Merge branch 'master' into docker_package
|
2022-08-05 09:46:46 +08:00 |
wangliwen
|
a1bbd95591
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-05 09:46:19 +08:00 |
wangliwen
|
e4736d2ac4
|
部门审批人用户状态被停用时,流程不再分配给该用户
|
2022-08-05 09:46:09 +08:00 |
dinggang
|
a0901114ec
|
..
|
2022-08-05 09:18:29 +08:00 |
wangliwen
|
8cb3d5bea5
|
Merge branch 'master' into docker_package
|
2022-08-05 09:09:29 +08:00 |
wangliwen
|
5023c7f288
|
屮
|
2022-08-05 09:09:14 +08:00 |
wangliwen
|
01242fb6f0
|
Merge branch 'master' into docker_package
|
2022-08-04 17:41:11 +08:00 |
huangweixiong
|
086c9ff165
|
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:
主动终止时 驳回置false
getByApplyFlag增加backToFirst标识
驳回重复通知
|
2022-08-04 17:24:49 +08:00 |
huangweixiong
|
082a6612ec
|
开启网关数据同步
|
2022-08-04 17:24:25 +08:00 |
wangliwen
|
b9b88cf135
|
Merge branch 'master' into docker_package
|
2022-08-04 11:21:14 +08:00 |
wangliwen
|
f2c55b7718
|
主动终止时 驳回置false
|
2022-08-04 10:57:36 +08:00 |
wangliwen
|
44226924de
|
切换docker打包服务器
|
2022-08-04 10:55:34 +08:00 |
wangliwen
|
d63a28e73e
|
Merge branch 'master' into docker_package
|
2022-08-04 10:17:06 +08:00 |
wangliwen
|
c728ff3960
|
getByApplyFlag增加backToFirst标识
|
2022-08-04 10:16:51 +08:00 |
wangliwen
|
a1465d0e9a
|
Merge branch 'master' into docker_package
|
2022-08-03 18:40:25 +08:00 |
wangliwen
|
f47682c7f3
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-03 18:40:04 +08:00 |
wangliwen
|
aa482a8fb8
|
Merge branch 'master' into docker_package
|
2022-08-03 18:39:33 +08:00 |
wangliwen
|
0753dcf27c
|
驳回重复通知
|
2022-08-03 18:39:18 +08:00 |
huangweixiong
|
359e49f7db
|
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:
...
|
2022-08-03 18:06:50 +08:00 |
wangliwen
|
cf534258f7
|
Merge branch 'master' into docker_package
|
2022-08-03 18:05:35 +08:00 |
wangliwen
|
ec2b030a30
|
...
|
2022-08-03 18:05:20 +08:00 |
huangweixiong
|
ebfbe769a6
|
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:
资源上架异常
。。。
pageWithAttrs补充返回approveStatus字段值
。。。
配置文件新增默认审批人id
管理系统-用户管理-列表查询新增根据用户姓名模糊查询
被驳回 消息通知
被驳回时发送消息通知
|
2022-08-03 18:05:05 +08:00 |
huangweixiong
|
8e69ca0526
|
网关总数同步
|
2022-08-03 18:04:47 +08:00 |
wangliwen
|
357ad936f2
|
Merge branch 'master' into docker_package
|
2022-08-03 17:49:20 +08:00 |
wangliwen
|
c27816d13a
|
资源上架异常
|
2022-08-03 17:49:04 +08:00 |
wangliwen
|
0c2409488a
|
Merge branch 'master' into docker_package
|
2022-08-03 16:50:13 +08:00 |
wangliwen
|
6159b3b1ba
|
。。。
|
2022-08-03 16:49:52 +08:00 |
wangliwen
|
a09db3a28e
|
Merge branch 'master' into docker_package
|
2022-08-03 16:39:49 +08:00 |
wangliwen
|
654ef21298
|
pageWithAttrs补充返回approveStatus字段值
|
2022-08-03 16:39:33 +08:00 |
wangliwen
|
7d634eefdf
|
Merge branch 'master' into docker_package
|
2022-08-03 16:28:34 +08:00 |
wangliwen
|
d59ebd507b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-03 16:28:18 +08:00 |
wangliwen
|
8b40e077d1
|
。。。
|
2022-08-03 16:27:54 +08:00 |
dinggang
|
d945bad3a5
|
配置文件新增默认审批人id
|
2022-08-03 16:26:04 +08:00 |
wangliwen
|
6425515e28
|
Merge branch 'master' into docker_package
|
2022-08-03 15:51:25 +08:00 |
dinggang
|
d0c8b4ae5f
|
管理系统-用户管理-列表查询新增根据用户姓名模糊查询
|
2022-08-03 15:22:03 +08:00 |
wangliwen
|
380cf848e3
|
Merge branch 'master' into docker_package
|
2022-08-03 15:10:03 +08:00 |
wangliwen
|
46ccea4556
|
被驳回 消息通知
|
2022-08-03 15:09:49 +08:00 |
wangliwen
|
f091b24110
|
Merge branch 'master' into docker_package
|
2022-08-03 14:41:39 +08:00 |
wangliwen
|
527266a9b5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-03 14:41:08 +08:00 |
wangliwen
|
1ec9b2db5c
|
被驳回时发送消息通知
|
2022-08-03 14:40:42 +08:00 |
huangweixiong
|
259f1b757a
|
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:
..
1、修改获取基础设施-视频资源的相关sql操作的表为cache表
发起者终止流程
存在欺诈行为?
npe
删除所有运行中的流程接口
...
npe
屮
..
。。。
???
用户主动终止流程
1.编目更新 2.工作台部门待办列表查询增加申请人姓名bugfix
通过实例id 终止流程
1、修改因为合并代码出现的基础设施-视频资源,点击左侧树报错的问题,原因是sql语句去组织cache表中查询了
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
..
超级管理员挂载能力时 无部门id问题
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/gateway/service/MonitorServiceV2.java
|
2022-08-03 14:27:30 +08:00 |
huangweixiong
|
04db7c6dc5
|
网关重启数据失效适配
|
2022-08-03 14:24:35 +08:00 |
dinggang
|
af5e237b3d
|
..
|
2022-08-03 11:04:53 +08:00 |
wangliwen
|
e803835bbf
|
Merge branch 'master' into docker_package
|
2022-08-03 09:14:14 +08:00 |
yitonglei
|
975d6654ce
|
1、修改获取基础设施-视频资源的相关sql操作的表为cache表
|
2022-08-02 18:13:25 +08:00 |
wangliwen
|
b359c02bcc
|
Merge branch 'master' into docker_package
|
2022-08-02 16:59:03 +08:00 |
wangliwen
|
d0df922c62
|
发起者终止流程
|
2022-08-02 16:58:48 +08:00 |
wangliwen
|
1fba85a1aa
|
Merge branch 'master' into docker_package
|
2022-08-02 15:56:14 +08:00 |
wangliwen
|
a04745eaab
|
存在欺诈行为?
|
2022-08-02 15:55:58 +08:00 |
wangliwen
|
f4a36e8a22
|
Merge branch 'master' into docker_package
|
2022-08-02 15:41:23 +08:00 |
wangliwen
|
d170f9c177
|
npe
|
2022-08-02 15:40:46 +08:00 |
wangliwen
|
3074526828
|
Merge branch 'master' into docker_package
|
2022-08-02 15:32:25 +08:00 |
wangliwen
|
95989cc59c
|
删除所有运行中的流程接口
|
2022-08-02 15:32:08 +08:00 |
wangliwen
|
4606a21ab3
|
Merge branch 'master' into docker_package
|
2022-08-02 15:08:17 +08:00 |
wangliwen
|
d96f797813
|
...
|
2022-08-02 15:08:01 +08:00 |
wangliwen
|
06fc61a4fe
|
Merge branch 'master' into docker_package
|
2022-08-02 14:50:22 +08:00 |
wangliwen
|
cbd91df644
|
npe
|
2022-08-02 14:49:03 +08:00 |
wangliwen
|
a652a9a03b
|
Merge branch 'master' into docker_package
|
2022-08-02 14:09:14 +08:00 |