Commit Graph

  • 51fac0eb09 网关测试用接口 huangweixiong 2022-08-08 16:45:46 +0800
  • f8d3af0dc0 Merge branch 'master' into docker_package wangliwen 2022-08-08 16:26:25 +0800
  • a94fce5066 管理系统-工作台-部门待办列表查询及部门已办列表查询新增申请用户所在部门及申请内容字段 dinggang 2022-08-08 15:36:33 +0800
  • 1e8c970c39 能力挂接注册网关 huangweixiong 2022-08-08 15:17:03 +0800
  • f590c05463 Merge branch 'master' into docker_package wangliwen 2022-08-08 14:47:31 +0800
  • f7af710466 npe wangliwen 2022-08-08 14:47:15 +0800
  • 693fbe9a5b Merge branch 'master' into docker_package wangliwen 2022-08-08 10:46:27 +0800
  • 33c2b30a60 ... wangliwen 2022-08-08 10:46:13 +0800
  • f0eb0e7740 Merge branch 'master' into docker_package wangliwen 2022-08-08 09:59:00 +0800
  • c1cd6de9e3 wangliwen 2022-08-08 09:58:47 +0800
  • f07753a143 Merge branch 'master' into docker_package wangliwen 2022-08-08 09:44:12 +0800
  • 4d53ef4c99 TODO 异步优化 wangliwen 2022-08-08 09:43:57 +0800
  • 3de584e7e3 Merge branch 'master' into docker_package wangliwen 2022-08-06 09:48:59 +0800
  • 50696e2617 新赋予部门审批人权限用户分配审批去啊权重更大 wangliwen 2022-08-06 09:48:45 +0800
  • 8d15d7efc9 Merge branch 'master' into docker_package wangliwen 2022-08-05 18:06:06 +0800
  • e5da46fd4d sql更新 dinggang 2022-08-05 17:34:53 +0800
  • 3f2a769542 Merge branch 'master' into docker_package wangliwen 2022-08-05 17:15:05 +0800
  • b9a489beac Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-08-05 17:14:49 +0800
  • 16df18cddf 异步处理 能力申请 wangliwen 2022-08-05 17:14:44 +0800
  • 20c73efac5 修改ResourceDao.xml的selectByAppArea,增加了条件 AND tda.attr_type = '应用领域' yitonglei 2022-08-05 15:10:27 +0800
  • 0d50ad1e4b Merge branch 'master' into docker_package wangliwen 2022-08-05 12:48:21 +0800
  • 1047569a77 。。。 wangliwen 2022-08-05 12:48:03 +0800
  • da785822e0 Merge branch 'master' into docker_package wangliwen 2022-08-05 11:56:44 +0800
  • 36ad699d38 Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-08-05 11:56:26 +0800
  • c065c04703 资源部门被删 wangliwen 2022-08-05 11:56:16 +0800
  • 603d107b65 ... dinggang 2022-08-05 10:41:55 +0800
  • 45718e5a35 Merge branch 'master' into docker_package wangliwen 2022-08-05 10:25:42 +0800
  • 0666081fdc Merge branch 'dev' wangliwen 2022-08-05 10:25:20 +0800
  • 166fe05195 。。。 wangliwen 2022-08-05 10:25:00 +0800
  • 8953cbd867 减少日志输出 dinggang 2022-08-05 09:59:47 +0800
  • d3f92adacc Merge branch 'master' into docker_package wangliwen 2022-08-05 09:46:46 +0800
  • a1bbd95591 Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-08-05 09:46:19 +0800
  • e4736d2ac4 部门审批人用户状态被停用时,流程不再分配给该用户 wangliwen 2022-08-05 09:46:09 +0800
  • a0901114ec .. dinggang 2022-08-05 09:18:29 +0800
  • 8cb3d5bea5 Merge branch 'master' into docker_package wangliwen 2022-08-05 09:09:29 +0800
  • e33a7ede3b Merge branch 'dev' wangliwen 2022-08-05 09:09:22 +0800
  • 5023c7f288 wangliwen 2022-08-05 09:09:14 +0800
  • 01242fb6f0 Merge branch 'master' into docker_package wangliwen 2022-08-04 17:41:11 +0800
  • 3d3cf6f6f1 Merge branch 'dev' wangliwen 2022-08-04 17:41:00 +0800
  • 086c9ff165 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev huangweixiong 2022-08-04 17:24:49 +0800
  • 082a6612ec 开启网关数据同步 huangweixiong 2022-08-04 17:24:25 +0800
  • b9b88cf135 Merge branch 'master' into docker_package wangliwen 2022-08-04 11:21:14 +0800
  • 832ec73593 Merge branch 'dev' wangliwen 2022-08-04 11:21:07 +0800
  • f2c55b7718 主动终止时 驳回置false wangliwen 2022-08-04 10:57:36 +0800
  • 44226924de 切换docker打包服务器 wangliwen 2022-08-04 10:55:34 +0800
  • d63a28e73e Merge branch 'master' into docker_package wangliwen 2022-08-04 10:17:06 +0800
  • 2360250ef6 Merge branch 'dev' wangliwen 2022-08-04 10:16:58 +0800
  • c728ff3960 getByApplyFlag增加backToFirst标识 wangliwen 2022-08-04 10:16:51 +0800
  • a1465d0e9a Merge branch 'master' into docker_package wangliwen 2022-08-03 18:40:25 +0800
  • d04251da8c Merge branch 'dev' wangliwen 2022-08-03 18:40:18 +0800
  • f47682c7f3 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev wangliwen 2022-08-03 18:40:04 +0800
  • aa482a8fb8 Merge branch 'master' into docker_package wangliwen 2022-08-03 18:39:33 +0800
  • 5bea71c741 Merge branch 'dev' wangliwen 2022-08-03 18:39:26 +0800
  • 0753dcf27c 驳回重复通知 wangliwen 2022-08-03 18:39:18 +0800
  • 359e49f7db Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev huangweixiong 2022-08-03 18:06:50 +0800
  • cf534258f7 Merge branch 'master' into docker_package wangliwen 2022-08-03 18:05:35 +0800
  • 6190d383a0 Merge branch 'dev' wangliwen 2022-08-03 18:05:27 +0800
  • ec2b030a30 ... wangliwen 2022-08-03 18:05:20 +0800
  • ebfbe769a6 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev huangweixiong 2022-08-03 18:05:05 +0800
  • 8e69ca0526 网关总数同步 huangweixiong 2022-08-03 18:04:47 +0800
  • 357ad936f2 Merge branch 'master' into docker_package wangliwen 2022-08-03 17:49:20 +0800
  • 2a22e86a12 Merge branch 'dev' wangliwen 2022-08-03 17:49:13 +0800
  • c27816d13a 资源上架异常 wangliwen 2022-08-03 17:49:04 +0800
  • 0c2409488a Merge branch 'master' into docker_package wangliwen 2022-08-03 16:50:13 +0800
  • cf88661cce Merge branch 'dev' wangliwen 2022-08-03 16:50:06 +0800
  • 6159b3b1ba 。。。 wangliwen 2022-08-03 16:49:52 +0800
  • a09db3a28e Merge branch 'master' into docker_package wangliwen 2022-08-03 16:39:49 +0800
  • 31c5888e92 Merge branch 'dev' wangliwen 2022-08-03 16:39:41 +0800
  • 654ef21298 pageWithAttrs补充返回approveStatus字段值 wangliwen 2022-08-03 16:39:33 +0800
  • 7d634eefdf Merge branch 'master' into docker_package wangliwen 2022-08-03 16:28:34 +0800
  • 6e303ec5c8 Merge branch 'dev' wangliwen 2022-08-03 16:28:28 +0800
  • d59ebd507b Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-08-03 16:28:18 +0800
  • 8b40e077d1 。。。 wangliwen 2022-08-03 16:27:54 +0800
  • d945bad3a5 配置文件新增默认审批人id dinggang 2022-08-03 16:26:04 +0800
  • 6425515e28 Merge branch 'master' into docker_package wangliwen 2022-08-03 15:51:25 +0800
  • 03cd4adbb0 Merge branch 'dev' wangliwen 2022-08-03 15:51:18 +0800
  • d0c8b4ae5f 管理系统-用户管理-列表查询新增根据用户姓名模糊查询 dinggang 2022-08-03 15:22:03 +0800
  • 380cf848e3 Merge branch 'master' into docker_package wangliwen 2022-08-03 15:10:03 +0800
  • e2dde1c658 Merge branch 'dev' wangliwen 2022-08-03 15:09:55 +0800
  • 46ccea4556 被驳回 消息通知 wangliwen 2022-08-03 15:09:49 +0800
  • f091b24110 Merge branch 'master' into docker_package wangliwen 2022-08-03 14:41:39 +0800
  • a068f97ab6 Merge branch 'dev' wangliwen 2022-08-03 14:41:30 +0800
  • 527266a9b5 Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-08-03 14:41:08 +0800
  • 1ec9b2db5c 被驳回时发送消息通知 wangliwen 2022-08-03 14:40:42 +0800
  • 259f1b757a Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev huangweixiong 2022-08-03 14:27:30 +0800
  • 04db7c6dc5 网关重启数据失效适配 huangweixiong 2022-08-03 14:24:35 +0800
  • af5e237b3d .. dinggang 2022-08-03 11:04:53 +0800
  • e803835bbf Merge branch 'master' into docker_package wangliwen 2022-08-03 09:14:14 +0800
  • 1c7e5adee0 Merge branch 'dev' wangliwen 2022-08-03 09:14:06 +0800
  • 975d6654ce 1、修改获取基础设施-视频资源的相关sql操作的表为cache表 yitonglei 2022-08-02 18:13:25 +0800
  • b359c02bcc Merge branch 'master' into docker_package wangliwen 2022-08-02 16:59:03 +0800
  • d9bb1e2d74 Merge branch 'dev' wangliwen 2022-08-02 16:58:55 +0800
  • d0df922c62 发起者终止流程 wangliwen 2022-08-02 16:58:48 +0800
  • 1fba85a1aa Merge branch 'master' into docker_package wangliwen 2022-08-02 15:56:14 +0800
  • e1fb0ee740 Merge branch 'dev' wangliwen 2022-08-02 15:56:06 +0800
  • a04745eaab 存在欺诈行为? wangliwen 2022-08-02 15:55:58 +0800
  • f4a36e8a22 Merge branch 'master' into docker_package wangliwen 2022-08-02 15:41:23 +0800
  • 8934eca897 Merge branch 'dev' wangliwen 2022-08-02 15:41:14 +0800
  • d170f9c177 npe wangliwen 2022-08-02 15:40:46 +0800
  • 3074526828 Merge branch 'master' into docker_package wangliwen 2022-08-02 15:32:25 +0800