FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
773 Commits 1 Branch 0 Tags
73885d444e5d2cb00a02ce54a5313f3796bf41f9
Commit Graph
773 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu 73885d444e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !139
 2021-08-30 04:42:48 +00: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
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
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
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
zhaokaiyao@91isoft.com 016e7e9003 修改预警时间 2021-08-27 11:29:15 +08:00
Mr.Z cf60309f2b 标准预警标准编号与名称跳页~~ 2021-08-27 11:26:32 +08:00
Mr.Z 8cf4fec559 标准预警标准编号与名称跳页~~ 2021-08-27 11:25:17 +08:00
Mr.Z 05994c6014 标准预警标准编号与名称跳页~~ 2021-08-27 11:24:27 +08:00
yuezhihang 638a988a9d Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-27 09:23:22 +08:00
Mr.Z 07bd24b7cf 标准拆分的批量删除与编辑~~ 2021-08-26 20:44:51 +08:00
yuezhihang 6aeb9b91ac 公开征求意见 2021-08-26 14:25:12 +08:00
yuezhihang 7b940f7c91 配置 2021-08-26 13:56:12 +08:00
yuezhihang 6c94bcb070 首页征求意见倒序 2021-08-26 13:55:21 +08:00
yuezhihang 120ee599b7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-26 13:54:35 +08:00
yuezhihang 19ed562068 首页 征求意见倒序排序 2021-08-26 13:54:24 +08:00
Mr.Z 4eb9e91554 Merge branch 'develop_master' into develop_1 2021-08-26 11:15:54 +08:00
super_liu f9703387b9 Merge branch 'develop_3' into 'develop_master' 
定时时间

See merge request !136
 2021-08-26 02:38:50 +00:00
zhaokaiyao@91isoft.com bab79aec98 定时时间 2021-08-26 10:32:47 +08:00
Mr.Z 6ada02e26d Merge branch 'develop_master' into develop_1 2021-08-26 10:27:59 +08:00
super_liu 2f4ca61144 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !135
 2021-08-26 02:27:07 +00:00
zhaokaiyao@91isoft.com 6e0091f875 标准预警 2021-08-26 10:23:02 +08:00
zhaokaiyao@91isoft.com 426ff38355 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-08-26 10:22:15 +08:00
yuezhihang ca84264193 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-26 09:42:57 +08:00
super_liu ee0eac6ae0 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the

See merge request !134
 2021-08-25 09:21:30 +00:00
super_liu 71aba6aa2d feat: There is no way the 2021-08-25 17:20:45 +08:00
yanyizhou dbac199130 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-25 17:03:28 +08:00
yanyizhou 74167d2d76 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-25 17:03:20 +08:00
yanyizhou 51055e0374 不一致项 查询 加standType 2021-08-25 17:02:59 +08:00