Commit Graph

2657 Commits

Author SHA1 Message Date
wangliwen d0fbaee7ba Merge branch 'dev' 2022-12-01 17:30:38 +08:00
wangliwen 0a174de50a 数据资源左侧树 2022-12-01 17:30:28 +08:00
wangliwen 32ac7bf16b Merge branch 'master' into docker_package 2022-12-01 15:48:01 +08:00
wangliwen 9f9ff3fd27 Merge branch 'dev' 2022-12-01 15:47:53 +08:00
wangliwen 3a87c7381d 增加能力申请 是否存在子单驳回的情况 2022-12-01 15:47:08 +08:00
wangliwen 8059071f89 Merge branch 'master' into docker_package 2022-12-01 15:17:38 +08:00
wangliwen 37ca5ade65 Merge branch 'dev' 2022-12-01 15:17:31 +08:00
wangliwen bf684bacbb 能力申请催办相关 2022-12-01 15:17:16 +08:00
wangliwen 9aa06f6253 Merge branch 'master' into docker_package 2022-12-01 14:22:20 +08:00
wangliwen 1bccf11ddb Merge branch 'dev' 2022-12-01 14:22:12 +08:00
wangliwen 49d94eda9d Merge remote-tracking branch '备份/dev' into dev 2022-12-01 14:21:56 +08:00
wangliwen 86c0f106ff 流程内催办条件的判断 2022-12-01 14:21:44 +08:00
dinggang 82faf95eff 1.西海岸审批逻辑修改
2.资源汇聚总量统计区分西海岸和市局环境
2022-12-01 09:12:54 +08:00
wangliwen 23d4fd447a Merge branch 'master' into docker_package 2022-11-30 18:55:05 +08:00
wangliwen e437a6819d Merge branch 'dev' 2022-11-30 18:54:58 +08:00
wangliwen 43441e4212 ... 2022-11-30 18:54:51 +08:00
wangliwen b2c780b3e6 Merge branch 'master' into docker_package 2022-11-30 18:45:21 +08:00
wangliwen 92213dccd5 Merge branch 'dev' 2022-11-30 18:45:12 +08:00
wangliwen 57a6014249 sql字段缺失补充 2022-11-30 18:45:05 +08:00
wangliwen 1669dc52ff Merge branch 'master' into docker_package 2022-11-30 18:31:22 +08:00
wangliwen ecf908b5bf Merge branch 'dev' 2022-11-30 18:31:16 +08:00
wangliwen 091e18e6c4 npe的处理 2022-11-30 18:31:09 +08:00
wangliwen 6e71734a50 Merge branch 'master' into docker_package 2022-11-30 18:25:35 +08:00
wangliwen 89b16b4ddf Merge branch 'dev' 2022-11-30 18:25:28 +08:00
wangliwen e96b6f864c 补充全 2022-11-30 18:25:20 +08:00
wangliwen 440400c57f Merge branch 'master' into docker_package 2022-11-30 18:15:20 +08:00
wangliwen 81d7b6dff3 Merge branch 'dev' 2022-11-30 18:15:14 +08:00
wangliwen d32dc84539 ... 2022-11-30 18:15:07 +08:00
wangliwen d2dcacd3a0 Merge branch 'master' into docker_package 2022-11-30 17:57:58 +08:00
wangliwen 96426b2189 Merge branch 'dev' 2022-11-30 17:57:51 +08:00
wangliwen ca9c670032 发起催办业务 2022-11-30 17:57:42 +08:00
wangliwen cbf870c384 Merge branch 'master' into docker_package 2022-11-30 17:31:52 +08:00
wangliwen a9128a99c3 Merge branch 'dev' 2022-11-30 17:31:44 +08:00
wangliwen 58b14ce45e 催办 框架代码与催办消息通知实现 2022-11-30 17:31:03 +08:00
wangliwen fbdb427e54 Merge branch 'master' into docker_package 2022-11-30 12:55:57 +08:00
wangliwen 7bb0c3997d Merge branch 'dev' 2022-11-30 12:55:51 +08:00
wangliwen 2fbc050fa8 sql文件调整 2022-11-30 12:55:38 +08:00
wangliwen b8dfcad52a Merge branch 'master' into docker_package 2022-11-30 12:41:50 +08:00
wangliwen f4714a6dd1 Merge branch 'dev' 2022-11-30 12:41:43 +08:00
wangliwen a809e23874 催办表的创建与配置项的加入 2022-11-30 12:41:35 +08:00
wangliwen da6e87fe44 Merge branch 'master' into docker_package 2022-11-29 18:07:36 +08:00
wangliwen efb2d71a55 Merge branch 'dev' 2022-11-29 18:07:28 +08:00
dinggang 03f37f2083 1.错误修复
2.用户信息修改增加日志记录
2022-11-29 18:06:26 +08:00
wangliwen 3f2b29999c Merge branch 'master' into docker_package 2022-11-29 13:17:43 +08:00
wangliwen e4b3caeb0c Merge branch 'dev' 2022-11-29 13:17:35 +08:00
dinggang 476b88a806 统计修改
sql错误修复
2022-11-29 13:16:12 +08:00
wangliwen 9a4a9c4ac3 Merge branch 'master' into docker_package 2022-11-29 08:58:39 +08:00
wangliwen 2719a1aa6c Merge branch 'dev' 2022-11-29 08:58:28 +08:00
dinggang 2d152dd94d .. 2022-11-29 08:57:32 +08:00
wangliwen 41a9aec6da Merge branch 'master' into docker_package 2022-11-29 08:57:11 +08:00