Commit Graph

  • 6e2ba70c84 Merge branch 'dev' wangliwen 2022-12-08 09:20:18 +0800
  • c8a5e0450c Merge remote-tracking branch '备份/dev' into dev wangliwen 2022-12-08 09:20:08 +0800
  • 63c979057f fix 474 wangliwen 2022-12-08 09:19:59 +0800
  • aa31a7bd43 1.浪潮政务云视频和云资源申请相关接口 2.全局搜索统计增加政务云资源搜索结果 3.后台管理-能力统计-能力上架统计-明细页面SQL调整 dinggang 2022-12-08 09:12:24 +0800
  • d2b1cb4114 Merge branch 'master' into docker_package wangliwen 2022-12-06 18:09:22 +0800
  • 6c5559e0ab Merge branch 'dev' wangliwen 2022-12-06 18:09:12 +0800
  • 1289bfc619 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev dinggang 2022-12-06 18:08:42 +0800
  • 948c1d2d55 1.全局搜索增加政务云资源搜索结果 2.后台管理-通知管理-我的通知增加按通知类型筛选 3.对接浪潮政务云资源和云视频 dinggang 2022-12-06 18:01:51 +0800
  • c03a788bda Merge branch 'master' into docker_package wangliwen 2022-12-06 17:57:36 +0800
  • 9d0b6d4d4c Merge branch 'dev' wangliwen 2022-12-06 17:57:29 +0800
  • b6de83347a ... wangliwen 2022-12-06 17:57:17 +0800
  • f3f911e726 Merge branch 'master' into docker_package wangliwen 2022-12-06 10:06:50 +0800
  • c57003e31c Merge branch 'dev' wangliwen 2022-12-06 10:06:41 +0800
  • e1abfa6e5d 批量驳回接口 wangliwen 2022-12-06 10:06:31 +0800
  • fa0c9f0f61 Merge branch 'master' into docker_package wangliwen 2022-12-05 16:59:48 +0800
  • 9874820779 Merge branch 'dev' wangliwen 2022-12-05 16:59:41 +0800
  • 9832a37e2c ... wangliwen 2022-12-05 16:59:30 +0800
  • 5e23978366 Merge branch 'master' into docker_package wangliwen 2022-12-05 16:09:15 +0800
  • dbc8759760 Merge branch 'dev' wangliwen 2022-12-05 16:09:08 +0800
  • 386478aa76 Merge remote-tracking branch '备份/dev' into dev wangliwen 2022-12-05 16:08:56 +0800
  • 19e6f7d5a4 能力申请每个任务节点加入催办信息与状态 wangliwen 2022-12-05 16:08:46 +0800
  • b2b21f6442 漏提交 dinggang 2022-12-05 15:56:27 +0800
  • c4e43ff5ef 资金大屏统计修改 dinggang 2022-12-05 15:55:44 +0800
  • 4d6b3552db Merge branch 'master' into docker_package wangliwen 2022-12-05 15:26:31 +0800
  • b5995b1d26 Merge branch 'dev' wangliwen 2022-12-05 15:26:22 +0800
  • 7e332201c4 从未催办过的任务 判断是否已超过预置天数 wangliwen 2022-12-05 15:26:13 +0800
  • 6bc3e01863 Merge branch 'master' into docker_package wangliwen 2022-12-05 14:17:45 +0800
  • 1bb9540e86 Merge branch 'dev' wangliwen 2022-12-05 14:17:35 +0800
  • 9e618c75cc 催办信息保存前判断 wangliwen 2022-12-05 14:17:27 +0800
  • 54d0ca1ecf Merge branch 'master' into docker_package wangliwen 2022-12-05 11:59:54 +0800
  • 7ecfad7e81 Merge branch 'dev' wangliwen 2022-12-05 11:58:34 +0800
  • 8d62701756 ... wangliwen 2022-12-05 11:58:23 +0800
  • 1d33f23fc3 ... wangliwen 2022-12-05 11:57:35 +0800
  • df61e3cd99 Merge branch 'master' into docker_package wangliwen 2022-12-05 10:28:50 +0800
  • c8f603df6a Merge branch 'dev' wangliwen 2022-12-05 10:28:42 +0800
  • 4b724593c6 。。。 wangliwen 2022-12-05 10:26:16 +0800
  • 5a66d2423e Merge branch 'master' into docker_package wangliwen 2022-12-05 09:53:13 +0800
  • b1989791b0 Merge branch 'dev' wangliwen 2022-12-05 09:53:06 +0800
  • 77185be5c1 能力申请的催办判断 wangliwen 2022-12-05 09:52:54 +0800
  • 4bca4247d3 Merge branch 'master' into docker_package wangliwen 2022-12-05 09:20:54 +0800
  • 570cfd0d5c Merge branch 'dev' wangliwen 2022-12-05 09:20:47 +0800
  • 1a2d443bc0 查看能力申请详情时返回催办相关信息 wangliwen 2022-12-05 09:20:37 +0800
  • 7ac416f92c Merge branch 'master' into docker_package wangliwen 2022-12-02 18:16:57 +0800
  • 4268e557a5 Merge branch 'dev' wangliwen 2022-12-02 18:16:49 +0800
  • 5c3f32f313 用户角色消失问题 dinggang 2022-12-02 16:50:29 +0800
  • b695006954 Merge branch 'master' into docker_package wangliwen 2022-12-02 15:46:39 +0800
  • 0b572a1e8b Merge branch 'dev' wangliwen 2022-12-02 15:46:12 +0800
  • 4789a3cb60 批量审核通过接口 wangliwen 2022-12-02 15:14:40 +0800
  • e9f709ce0f Merge branch 'master' into docker_package wangliwen 2022-12-02 14:19:58 +0800
  • 7703c6d6cf Merge branch 'dev' wangliwen 2022-12-02 14:19:48 +0800
  • f39a9e473e 市局数据资源按照上线部门出数据资源列表 wangliwen 2022-12-02 14:18:54 +0800
  • 96321f7b84 Merge branch 'master' into docker_package wangliwen 2022-12-01 18:18:47 +0800
  • 230664910c Merge branch 'dev' wangliwen 2022-12-01 18:18:40 +0800
  • f8088fb2f9 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev dinggang 2022-12-01 18:17:07 +0800
  • fee19d8f17 1.公告相关接口 2.建表sql 3.我的待办-能力申请增加资源类型及提供部门字段 4.减少无用日志输出 dinggang 2022-12-01 18:16:43 +0800
  • 1783204473 Merge branch 'master' into docker_package wangliwen 2022-12-01 17:30:48 +0800
  • d0fbaee7ba Merge branch 'dev' wangliwen 2022-12-01 17:30:38 +0800
  • 0a174de50a 数据资源左侧树 wangliwen 2022-12-01 17:30:28 +0800
  • 32ac7bf16b Merge branch 'master' into docker_package wangliwen 2022-12-01 15:48:01 +0800
  • 9f9ff3fd27 Merge branch 'dev' wangliwen 2022-12-01 15:47:53 +0800
  • 3a87c7381d 增加能力申请 是否存在子单驳回的情况 wangliwen 2022-12-01 15:47:08 +0800
  • 8059071f89 Merge branch 'master' into docker_package wangliwen 2022-12-01 15:17:38 +0800
  • 37ca5ade65 Merge branch 'dev' wangliwen 2022-12-01 15:17:31 +0800
  • bf684bacbb 能力申请催办相关 wangliwen 2022-12-01 15:17:16 +0800
  • c8207fef82 公告管理代码 千万不要合并这个分支 Chenhengjie Li 2022-12-01 14:40:49 +0800
  • 9aa06f6253 Merge branch 'master' into docker_package wangliwen 2022-12-01 14:22:20 +0800
  • 1bccf11ddb Merge branch 'dev' wangliwen 2022-12-01 14:22:12 +0800
  • 49d94eda9d Merge remote-tracking branch '备份/dev' into dev wangliwen 2022-12-01 14:21:56 +0800
  • 86c0f106ff 流程内催办条件的判断 wangliwen 2022-12-01 14:21:44 +0800
  • 82faf95eff 1.西海岸审批逻辑修改 2.资源汇聚总量统计区分西海岸和市局环境 dinggang 2022-12-01 09:12:54 +0800
  • 23d4fd447a Merge branch 'master' into docker_package wangliwen 2022-11-30 18:55:05 +0800
  • e437a6819d Merge branch 'dev' wangliwen 2022-11-30 18:54:58 +0800
  • 43441e4212 ... wangliwen 2022-11-30 18:54:51 +0800
  • b2c780b3e6 Merge branch 'master' into docker_package wangliwen 2022-11-30 18:45:21 +0800
  • 92213dccd5 Merge branch 'dev' wangliwen 2022-11-30 18:45:12 +0800
  • 57a6014249 sql字段缺失补充 wangliwen 2022-11-30 18:45:05 +0800
  • 1669dc52ff Merge branch 'master' into docker_package wangliwen 2022-11-30 18:31:22 +0800
  • ecf908b5bf Merge branch 'dev' wangliwen 2022-11-30 18:31:16 +0800
  • 091e18e6c4 npe的处理 wangliwen 2022-11-30 18:31:09 +0800
  • 6e71734a50 Merge branch 'master' into docker_package wangliwen 2022-11-30 18:25:35 +0800
  • 89b16b4ddf Merge branch 'dev' wangliwen 2022-11-30 18:25:28 +0800
  • e96b6f864c 补充全 wangliwen 2022-11-30 18:25:20 +0800
  • 440400c57f Merge branch 'master' into docker_package wangliwen 2022-11-30 18:15:20 +0800
  • 81d7b6dff3 Merge branch 'dev' wangliwen 2022-11-30 18:15:14 +0800
  • d32dc84539 ... wangliwen 2022-11-30 18:15:07 +0800
  • d2dcacd3a0 Merge branch 'master' into docker_package wangliwen 2022-11-30 17:57:58 +0800
  • 96426b2189 Merge branch 'dev' wangliwen 2022-11-30 17:57:51 +0800
  • ca9c670032 发起催办业务 wangliwen 2022-11-30 17:57:42 +0800
  • cbf870c384 Merge branch 'master' into docker_package wangliwen 2022-11-30 17:31:52 +0800
  • a9128a99c3 Merge branch 'dev' wangliwen 2022-11-30 17:31:44 +0800
  • 58b14ce45e 催办 框架代码与催办消息通知实现 wangliwen 2022-11-30 17:31:03 +0800
  • fbdb427e54 Merge branch 'master' into docker_package wangliwen 2022-11-30 12:55:57 +0800
  • 7bb0c3997d Merge branch 'dev' wangliwen 2022-11-30 12:55:51 +0800
  • 2fbc050fa8 sql文件调整 wangliwen 2022-11-30 12:55:38 +0800
  • b8dfcad52a Merge branch 'master' into docker_package wangliwen 2022-11-30 12:41:50 +0800
  • f4714a6dd1 Merge branch 'dev' wangliwen 2022-11-30 12:41:43 +0800
  • a809e23874 催办表的创建与配置项的加入 wangliwen 2022-11-30 12:41:35 +0800
  • da6e87fe44 Merge branch 'master' into docker_package wangliwen 2022-11-29 18:07:36 +0800
  • efb2d71a55 Merge branch 'dev' wangliwen 2022-11-29 18:07:28 +0800
  • 03f37f2083 1.错误修复 2.用户信息修改增加日志记录 dinggang 2022-11-29 18:06:26 +0800