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
|
e33a7ede3b
|
Merge branch 'dev'
|
2022-08-05 09:09:22 +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 |
|
wangliwen
|
3d3cf6f6f1
|
Merge branch 'dev'
|
2022-08-04 17:41:00 +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
|
832ec73593
|
Merge branch 'dev'
|
2022-08-04 11:21:07 +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
|
2360250ef6
|
Merge branch 'dev'
|
2022-08-04 10:16:58 +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
|
d04251da8c
|
Merge branch 'dev'
|
2022-08-03 18:40:18 +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
|
5bea71c741
|
Merge branch 'dev'
|
2022-08-03 18:39:26 +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
|
6190d383a0
|
Merge branch 'dev'
|
2022-08-03 18:05:27 +08:00 |
|
wangliwen
|
ec2b030a30
|
...
|
2022-08-03 18:05:20 +08:00 |