FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
800 Commits 1 Branch 0 Tags
e86f5cfbe7bd340d21560f64d0a0a62346c39c26
Commit Graph
800 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yanyizhou e86f5cfbe7 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-01 11:12:29 +08:00
Mr.Z 4204771472 标准预警初次修改~~ 2021-08-31 14:03:26 +08:00
yanyizhou 05a77b34a0 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-31 11:18:09 +08:00
yuezhihang 1ef143e71f 标准查询 标准号/标准姓名 ！！！ 2021-08-31 10:49:04 +08:00
yuezhihang fdd7fe18c0 清单查询失效问题 2021-08-31 10:29:29 +08:00
yanyizhou e706eaea22 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-30 18:07:00 +08:00
yanyizhou 1739a3d555 标准预警--加筛选条件 优化了代码（之前查询条件只有一个，所以传的string，现在有很多个，所以传了一个bean，我就把之前传的string那部分代码删了）希望人没事 2021-08-30 18:06:47 +08:00
yanyizhou de17b97ad9 标准预警--加筛选条件 2021-08-30 17:56:27 +08:00
yuezhihang 7ad71e5e6a Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-30 17:50:50 +08:00
yuezhihang 900437039d 项目清单确认流程 2021-08-30 17:50:45 +08:00
super_liu 770b0b1b8a feat: There is no way the 2021-08-30 16:46:03 +08:00
super_liu 74fd462657 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the

See merge request !141
 2021-08-30 08:25:31 +00:00
super_liu 455b58fffb feat: There is no way the 2021-08-30 16:21:17 +08:00
yanyizhou 00a19e76ba Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-30 15:26:10 +08:00
yanyizhou e443ee6164 标准合规评估结果--技术评估结果 查看里面的查询条件更改为标准号/标准名称和具体章条 2021-08-30 15:25:54 +08:00
super_liu 1312813fca Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request !140
 2021-08-30 07:11:47 +00:00
super_liu a57693fd39 Merge branch 'develop_master' into develop_migration 2021-08-30 15:11:00 +08:00
super_liu 99c32a2d7f feat: There is no way the convert 2021-08-30 15:08:55 +08:00
super_liu 73885d444e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !139
 2021-08-30 04:42:48 +00:00
yanyizhou b7ccbbfc45 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-30 10:34:17 +08:00
zhaokaiyao@91isoft.com f53cdd885b 更新定时任务时间 2021-08-30 10:03:03 +08:00
zhaokaiyao@91isoft.com 56e62ac041 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-08-30 09:56:54 +08:00
zhaokaiyao@91isoft.com 2fb1faacfa 标准预警,标准文本状态自动更新 2021-08-30 09:48:35 +08:00
yanyizhou 88cb99ad9b Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-30 09:05:14 +08:00
zhaokaiyao@91isoft.com 913fc6e8f5 国内外标准详情 分解单日期格式和条款名称模糊查询 2021-08-29 19:17:41 +08:00
super_liu 4c6cffa061 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request !138
 2021-08-27 10:02:01 +00:00
super_liu dd2fccc289 Merge branch 'develop_master' into develop_migration 2021-08-27 18:01:18 +08:00
super_liu d679b48299 feat: There is no way the linux convert path 2021-08-27 18:00:24 +08:00
yuezhihang 46978c9fdb Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-27 17:44:02 +08:00
yuezhihang 75888c8fa0 首页 结束时间正序 2021-08-27 17:43:56 +08:00
Mr.Z af428949a8 之前被覆盖的修改二次提交(；′⌒`)~~ 2021-08-27 17:33:06 +08:00
yanyizhou 1b38560d9f Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-27 16:32:00 +08:00
super_liu 0b75b7cea5 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request !137
 2021-08-27 08:20:06 +00:00
super_liu 7155dea894 Merge branch 'develop_master' into develop_migration 2021-08-27 16:18:54 +08:00
super_liu 531137fa86 feat: There is no way the 2021-08-27 16:18:03 +08:00
zhaokaiyao@91isoft.com d66fcc1ad1 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-08-27 15:30:35 +08:00
yuezhihang 73588cac91 需求 解读流程 最细条目 2021-08-27 15:30:24 +08:00
Mr.Z 349fa7e499 标准拆分的批量删除与编辑~~ 2021-08-27 15:30:24 +08:00
yuezhihang 9b9ebabe6b 公开征求意见 2021-08-27 15:30:24 +08:00
yuezhihang 653fd06d50 配置 2021-08-27 15:30:24 +08:00
yuezhihang 59f77d802c 首页征求意见倒序 2021-08-27 15:30:24 +08:00
yuezhihang 7ff86124b7 首页 征求意见倒序排序 2021-08-27 15:30:24 +08:00
Mr.Z baa674136b 征求意见流程导出bug修改~~ 2021-08-27 15:30:24 +08:00
yanyizhou 87f3c15a7b 不一致项 查询 加standType 2021-08-27 15:30:23 +08:00
yanyizhou 3070ec5e59 合并代码冲突 2021-08-27 15:30:23 +08:00
zhaokaiyao@91isoft.com c22db5b063 定时任务-修改文本状态 2021-08-27 15:24:32 +08:00
yanyizhou 6148add390 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-27 14:54:57 +08:00
yanyizhou 87a6ff319d Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-27 14:54:37 +08:00
yuezhihang 003315dde8 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-27 14:44:07 +08:00
yuezhihang 9185ef2b6a 需求 解读流程 最细条目 2021-08-27 14:43:47 +08:00