Commit Graph

1837 Commits

Author SHA1 Message Date
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 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 6190d383a0 Merge branch 'dev' 2022-08-03 18:05:27 +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 2a22e86a12 Merge branch 'dev' 2022-08-03 17:49:13 +08:00
wangliwen c27816d13a 资源上架异常 2022-08-03 17:49:04 +08:00
wangliwen cf88661cce Merge branch 'dev' 2022-08-03 16:50:06 +08:00
wangliwen 6159b3b1ba 。。。 2022-08-03 16:49:52 +08:00
wangliwen 31c5888e92 Merge branch 'dev' 2022-08-03 16:39:41 +08:00
wangliwen 654ef21298 pageWithAttrs补充返回approveStatus字段值 2022-08-03 16:39:33 +08:00
wangliwen 6e303ec5c8 Merge branch 'dev' 2022-08-03 16:28:28 +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 03cd4adbb0 Merge branch 'dev' 2022-08-03 15:51:18 +08:00
dinggang d0c8b4ae5f 管理系统-用户管理-列表查询新增根据用户姓名模糊查询 2022-08-03 15:22:03 +08:00
wangliwen e2dde1c658 Merge branch 'dev' 2022-08-03 15:09:55 +08:00
wangliwen 46ccea4556 被驳回 消息通知 2022-08-03 15:09:49 +08:00
wangliwen a068f97ab6 Merge branch 'dev' 2022-08-03 14:41:30 +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 1c7e5adee0 Merge branch 'dev' 2022-08-03 09:14:06 +08:00
yitonglei 975d6654ce 1、修改获取基础设施-视频资源的相关sql操作的表为cache表 2022-08-02 18:13:25 +08:00
wangliwen d9bb1e2d74 Merge branch 'dev' 2022-08-02 16:58:55 +08:00
wangliwen d0df922c62 发起者终止流程 2022-08-02 16:58:48 +08:00
wangliwen e1fb0ee740 Merge branch 'dev' 2022-08-02 15:56:06 +08:00
wangliwen a04745eaab 存在欺诈行为? 2022-08-02 15:55:58 +08:00
wangliwen 8934eca897 Merge branch 'dev' 2022-08-02 15:41:14 +08:00
wangliwen d170f9c177 npe 2022-08-02 15:40:46 +08:00
wangliwen 7d27ab5baa Merge branch 'dev' 2022-08-02 15:32:17 +08:00
wangliwen 95989cc59c 删除所有运行中的流程接口 2022-08-02 15:32:08 +08:00
wangliwen 4dd9840752 Merge branch 'dev' 2022-08-02 15:08:10 +08:00
wangliwen d96f797813 ... 2022-08-02 15:08:01 +08:00
wangliwen 819a5a3f6b Merge branch 'dev' 2022-08-02 14:50:16 +08:00
wangliwen cbd91df644 npe 2022-08-02 14:49:03 +08:00
wangliwen dcba8d59a8 Merge branch 'dev' 2022-08-02 14:09:06 +08:00
wangliwen bbf677b513 2022-08-02 14:08:57 +08:00
wangliwen e6ca8dc1a0 Merge branch 'dev' 2022-08-02 13:46:22 +08:00
wangliwen ef450bbf01 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-02 13:46:03 +08:00
dinggang 508c73df6b .. 2022-08-02 13:45:31 +08:00
wangliwen d21c3b7099 。。。 2022-08-02 13:44:53 +08:00
wangliwen fbf0c5150e Merge branch 'dev' 2022-08-02 12:00:51 +08:00