Commit Graph
100 Commits
Author SHA1 Message Date
super_liu c132519054 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!435
2022-03-31 09:58:11 +08:00
super_liu 863f355d6f feat: There is no way the, 2022-03-31 09:53:49 +08:00
super_liu 1769fd4218 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标属性数据表 BARQ 备案日期 字段类型改为 varchar

See merge request LiuChao/foton-slrs-system-rest!434
2022-03-29 10:52:45 +08:00
super_liu be984d157d feat: There is no way the, 企标属性数据表 BARQ 备案日期 字段类型改为 varchar 2022-03-29 10:52:09 +08:00
super_liu 6f559e9ea7 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!433
2022-03-29 10:48:41 +08:00
super_liu 26b9a70216 feat: There is no way the, 企标属性数据表 添加查询接口 2022-03-29 10:44:00 +08:00
super_liu dda0aeae41 feat: There is no way the, 企标复审入库 修改 通用更新企标接口 2022-03-29 10:28:28 +08:00
super_liu 40a0445fd1 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!432
2022-03-28 11:50:05 +08:00
super_liu a88f092575 feat: There is no way the, 2022-03-28 11:43:38 +08:00
super_liu 430626fac4 feat: There is no way the, 2022-03-28 11:43:11 +08:00
super_liu 152dda395e feat: There is no way the, BUG #51955 2022-03-28 11:15:45 +08:00
super_liu 4807ecde20 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!431
2022-03-27 17:30:27 +08:00
super_liu 51a49d194b feat: There is no way the, 2022-03-27 17:29:38 +08:00
super_liu 7902f3ea19 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, xxxxx

See merge request LiuChao/foton-slrs-system-rest!430
2022-03-25 21:23:21 +08:00
super_liu 25a36eff18 feat: There is no way the, xxxxx 2022-03-25 21:22:14 +08:00
super_liu d0c27e46f6 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, bug #52092

See merge request LiuChao/foton-slrs-system-rest!429
2022-03-25 17:09:16 +08:00
super_liu 9c3cf24422 feat: There is no way the, bug #52092 2022-03-25 17:07:46 +08:00
super_liu 3c95778f70 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标代替被代替

See merge request LiuChao/foton-slrs-system-rest!428
2022-03-25 13:33:13 +08:00
super_liu a1475db743 feat: There is no way the, 企标代替被代替 2022-03-25 13:32:10 +08:00
super_liu 0c2acec862 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标代替被代替

See merge request LiuChao/foton-slrs-system-rest!427
2022-03-25 11:15:14 +08:00
super_liu e4596c2044 feat: There is no way the, 企标代替被代替 2022-03-25 11:13:31 +08:00
super_liu d2867766b2 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, x

See merge request LiuChao/foton-slrs-system-rest!426
2022-03-24 23:45:47 +08:00
super_liu ed3882149a feat: There is no way the, x 2022-03-24 23:44:50 +08:00
super_liu b08c8465b4 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, x

See merge request LiuChao/foton-slrs-system-rest!425
2022-03-24 23:25:18 +08:00
super_liu 7c99eebac7 feat: There is no way the, x 2022-03-24 23:24:45 +08:00
super_liu 62fba506a4 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, bug #51957

See merge request LiuChao/foton-slrs-system-rest!424
2022-03-24 23:21:59 +08:00
super_liu 36194ba8eb feat: There is no way the, bug #51957 2022-03-24 23:21:25 +08:00
super_liu a9c0d8bb1c Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!423
2022-03-24 22:56:51 +08:00
super_liu d153a3be0f feat: There is no way the, 2022-03-24 22:55:15 +08:00
super_liu 309b59405c feat: There is no way the, 导出优化 字段维护 2022-03-24 18:21:29 +08:00
super_liu c4a7cad347 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, BUG #51976

See merge request LiuChao/foton-slrs-system-rest!422
2022-03-24 10:01:46 +08:00
super_liu 7067c45637 feat: There is no way the, BUG #51976 2022-03-24 09:56:27 +08:00
super_liu fcc739de48 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, bug #51962

See merge request LiuChao/foton-slrs-system-rest!421
2022-03-23 14:53:54 +08:00
super_liu 98a47392b6 feat: There is no way the, bug #51962 2022-03-23 14:53:00 +08:00
super_liu 7e41d25944 feat: There is no way the, 配置文件 添加 pdg 文件类型 2022-03-22 16:57:59 +08:00
super_liu e2c571a6cd Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 政策库注掉数据权限

See merge request LiuChao/foton-slrs-system-rest!420
2022-03-22 11:42:42 +08:00
super_liu 9868de7e0a feat: There is no way the, 政策库注掉数据权限 2022-03-22 11:40:37 +08:00
super_liu c3a1f804ca Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!419
2022-03-17 20:12:48 +08:00
super_liu 98fc9bbb56 feat: There is no way the, 2022-03-17 19:59:40 +08:00
super_liu 334dfb40f4 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, eeeeeeeeeeeeeeeeees

See merge request LiuChao/foton-slrs-system-rest!417
2022-03-08 20:16:38 +08:00
super_liu 26f5bdaff1 feat: There is no way the, eeeeeeeeeeeeeeeeees 2022-03-08 20:15:19 +08:00
super_liu 7b7cfcf476 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!416
2022-03-08 17:48:57 +08:00
super_liu 50039d0295 feat: There is no way the, 2022-03-08 17:48:12 +08:00
super_liu 42be7a4c22 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 提提提提

See merge request LiuChao/foton-slrs-system-rest!415
2022-03-08 17:02:05 +08:00
super_liu b12a559e02 feat: There is no way the, 提提提提 2022-03-08 17:01:28 +08:00
super_liu 230e035424 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 跑跑跑 跑数据 重置es

See merge request LiuChao/foton-slrs-system-rest!414
2022-03-08 16:36:54 +08:00
super_liu c1eeea3f1f feat: There is no way the, 跑跑跑 跑数据 重置es 2022-03-08 16:33:33 +08:00
super_liu 88809e05d4 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, xxx

See merge request LiuChao/foton-slrs-system-rest!413
2022-03-07 17:57:09 +08:00
super_liu f1ac00a8dc feat: There is no way the, xxx 2022-03-07 17:56:17 +08:00
super_liu 7dc6dd7b74 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, HHH

See merge request LiuChao/foton-slrs-system-rest!412
2022-03-07 17:46:00 +08:00
super_liu 7e2f0ffe85 feat: There is no way the, HHH 2022-03-07 17:45:03 +08:00
super_liu 73c31e34b2 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!411
2022-03-07 17:34:18 +08:00
super_liu 69c2d4c6e2 feat: There is no way the, 重置ES 2022-03-07 17:33:25 +08:00
super_liu 291ade6b35 feat: There is no way the, 企标标准关联表更新关联ID字段长度SQL文件 2022-03-07 16:49:27 +08:00
super_liu d44a2b6bf0 feat: There is no way the, 重置ES 2022-03-07 15:16:47 +08:00
super_liu 615db4e9eb feat: There is no way the, 重置ES 2022-03-07 13:20:31 +08:00
super_liu f85569c4bc feat: There is no way the, 删掉无效的引用 无法打包 2022-03-07 09:30:52 +08:00
super_liu ae26e35d3f Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标审批完入库后,入库人应为流程发起人

See merge request LiuChao/foton-slrs-system-rest!410
2022-03-03 16:08:21 +08:00
super_liu 13b603b526 feat: There is no way the, 企标审批完入库后,入库人应为流程发起人 2022-03-03 15:58:09 +08:00
super_liu 1bec67965b Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 水印加深0.1

See merge request LiuChao/foton-slrs-system-rest!409
2022-03-01 13:50:08 +08:00
super_liu bfd01ac605 feat: There is no way the, 水印加深0.1 2022-03-01 13:48:44 +08:00
super_liu c0a967e125 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 国外被代替标准号 注掉 之前逻辑

See merge request LiuChao/foton-slrs-system-rest!408
2022-02-24 17:04:34 +08:00
super_liu aaae03989b feat: There is no way the, 国外被代替标准号 注掉 之前逻辑 2022-02-24 17:02:06 +08:00
super_liu 95a80b832c Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!407
2022-02-24 13:54:37 +08:00
super_liu 86e74d5539 feat: There is no way the, 被代替标准自动生成 及 详情显示 2022-02-24 13:52:52 +08:00
super_liu 76a487e857 feat: There is no way the, 月末 (逻辑和 月初 一样 月末需跑一次下整月 防止特殊原因导致遗漏) 2022-02-24 10:46:56 +08:00
super_liu 287c909d25 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标复审计划月初逻辑 改为 下整月

See merge request LiuChao/foton-slrs-system-rest!406
2022-02-23 09:08:39 +08:00
super_liu 85e90b378d feat: There is no way the, 企标复审计划月初逻辑 改为 下整月 2022-02-23 09:05:59 +08:00
super_liu fea30dc871 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, tree async

See merge request LiuChao/foton-slrs-system-rest!405
2022-02-22 17:21:21 +08:00
super_liu 183ba86528 feat: There is no way the, tree async 2022-02-22 17:18:18 +08:00
super_liu 8fa99c5b30 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, buss tree auth

See merge request LiuChao/foton-slrs-system-rest!404
2022-02-21 17:48:33 +08:00
super_liu 5352684945 feat: There is no way the, buss tree auth 2022-02-21 17:44:29 +08:00
super_liu 6ba63d508c Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!403
2022-02-21 13:51:44 +08:00
super_liu e766dfdb53 feat: There is no way the, 注掉 国内 技术系列逻辑 2022-02-21 12:31:34 +08:00
super_liu 099df97db4 feat: There is no way the, tree 2022-02-21 12:26:24 +08:00
super_liu 341dcb9d5a Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 角色标准数据权限体系优化  国内标准左侧树 加入技术体系 待完成

See merge request LiuChao/foton-slrs-system-rest!402
2022-02-18 17:52:13 +08:00
super_liu 020b1e6a3f feat: There is no way the, 角色标准数据权限体系优化 国内标准左侧树 加入技术体系 待完成 2022-02-18 17:49:04 +08:00
super_liu c6b36f72e1 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 新企标复审入库

See merge request LiuChao/foton-slrs-system-rest!401
2022-02-17 17:27:45 +08:00
super_liu 8e7e210d35 feat: There is no way the, 新企标复审入库 2022-02-17 14:48:26 +08:00
super_liu f97f0d6e9c Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 在线编辑 修改传参

See merge request LiuChao/foton-slrs-system-rest!400
2022-02-16 08:56:14 +08:00
super_liu 95674848f2 feat: There is no way the, 在线编辑 修改传参 2022-02-15 16:27:19 +08:00
super_liu 658058a84f Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!399
2022-02-11 17:16:20 +08:00
super_liu 012df3992a feat: There is no way the, 2022-02-10 20:40:41 +08:00
super_liu 6a56242ee4 feat: There is no way the, 2022-02-08 20:06:43 +08:00
super_liu 5e58d5212a Merge branch 'develop_master' into FOTON 2022-02-07 17:14:25 +08:00
super_liu 267554936f Merge branch 'develop_master' into FOTON 2022-01-28 21:47:51 +08:00
super_liu 6af05b4947 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!398
2022-01-28 16:33:37 +08:00
super_liu 716c8c1ed6 feat: There is no way the, 2022-01-28 16:22:23 +08:00
super_liu 5b4f58d9db Merge branch 'develop_master' into FOTON 2022-01-27 22:44:41 +08:00
super_liu 34b0513275 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!396
2022-01-27 22:40:46 +08:00
super_liu f6cbfdf178 feat: There is no way the, 2022-01-27 22:38:34 +08:00
super_liu 8d1594d6cb Merge branch 'develop_master' into FOTON 2022-01-27 08:32:18 +08:00
super_liu 7dc4c65fbd Merge branch 'develop_master' into FOTON 2022-01-25 20:15:57 +08:00
super_liu dc559482ac Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, buss state scheduled

See merge request LiuChao/foton-slrs-system-rest!392
2022-01-25 20:11:08 +08:00
super_liu ccaf7d5b86 feat: There is no way the, buss state scheduled 2022-01-25 18:42:46 +08:00
super_liu 986092d8ea Merge branch 'develop_master' into FOTON 2022-01-24 20:10:43 +08:00
super_liu b992c47c94 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, buss state

See merge request LiuChao/foton-slrs-system-rest!391
2022-01-24 20:08:42 +08:00
super_liu 01a0a31d15 feat: There is no way the, buss state 2022-01-24 20:00:01 +08:00
super_liu 4bd68bb39d Merge branch 'develop_master' into FOTON 2022-01-22 08:26:29 +08:00
super_liu 1cab47439c Merge branch 'develop_master' into FOTON 2022-01-20 20:44:29 +08:00