FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
957 Commits 1 Branch 0 Tags
e777d1804460bcf4d1a96ff0ebd307a2ffcdc800
Commit Graph
957 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mr.Z e777d18044 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-22 09:45:04 +08:00
super_liu 0ccbc5cacf Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!175
 2021-09-17 09:34:59 +08:00
zhaokaiyao@91isoft.com 76b61d5d07 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-17 09:32:25 +08:00
zhaokaiyao@91isoft.com 7bc2d8124a 首页->标准发布->实施日期和发布日期比较时的日期格式 2021-09-17 09:31:52 +08:00
Mr.Z e8d901bb2f 分解单搜索问题~ 2021-09-16 20:11:23 +08:00
yuezhihang 69d5a15ce4 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-16 20:06:03 +08:00
yuezhihang 4d598a76a2 标准解读 章节1 展示 2021-09-16 20:05:48 +08:00
zhaokaiyao@91isoft.com e7e3848108 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-16 20:04:09 +08:00
zhaokaiyao@91isoft.com fe0a0f7dbe 国内外标准 实施日期排序 程序异常 group by问题 2021-09-16 20:03:40 +08:00
zhaokaiyao@91isoft.com ccf7d32945 首页标准发布 只查询文本状态为即将实施的数据 2021-09-16 19:27:36 +08:00
super_liu 66faec58e0 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!174
 2021-09-16 17:15:52 +08:00
super_liu 2878ca491a feat: There is no way the 2021-09-16 17:14:33 +08:00
zhaokaiyao@91isoft.com 3eb2ddce1e 分解单默认升序排序 2021-09-16 16:47:03 +08:00
super_liu 881055c810 Merge branch 'develop_master' into develop_migration 2021-09-16 15:02:39 +08:00
yuezhihang 9e392bf904 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-16 15:00:23 +08:00
yuezhihang 6e88f37c28 项目评估流程排序问题 2021-09-16 15:00:14 +08:00
super_liu 97ebfb6f6a feat: There is no way the 2021-09-16 14:56:39 +08:00
zhaokaiyao@91isoft.com 44ba80e050 解决了标准预警,条款预警标准号显示为null的问题 2021-09-16 10:48:19 +08:00
super_liu e195fbc416 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!173
 2021-09-16 09:15:15 +08:00
yuezhihang d5081e56f7 Merge remote-tracking branch 'origin/develop_3' into develop_master 2021-09-16 09:13:34 +08:00
zhaokaiyao@91isoft.com dcc461e041 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-16 09:11:51 +08:00
zhaokaiyao@91isoft.com d6331ab155 标准详情,已被分解的的文本才有分解单按钮 2021-09-15 18:01:06 +08:00
zhaokaiyao@91isoft.com 180b755bec 分解单排序 2021-09-15 17:07:37 +08:00
yuezhihang bcf47c93e1 查人组件 2021-09-15 16:34:47 +08:00
Mr.Z ba7dd33176 未符合项整改库标准号/标准名称搜索~ 2021-09-14 17:40:11 +08:00
super_liu b3e70132bd Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!172
 2021-09-14 15:43:29 +08:00
zhaokaiyao@91isoft.com 93fed98d3e Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-14 15:42:43 +08:00
zhaokaiyao@91isoft.com 33d084527b 导入文件路径 摒弃配置 2021-09-14 15:42:35 +08:00
super_liu 6d39c32956 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!171
 2021-09-14 15:13:09 +08:00
zhaokaiyao@91isoft.com 45da8e58d3 导入文件路径 摒弃配置设置 2021-09-14 15:11:58 +08:00
zhaokaiyao@91isoft.com b0c0a22906 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-14 15:09:16 +08:00
zhaokaiyao@91isoft.com aae27284b8 导入文件路径 2021-09-14 15:09:06 +08:00
super_liu 8c74fa5906 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!169
 2021-09-14 10:32:19 +08:00
zhaokaiyao@91isoft.com d133fefdab 注释 2021-09-13 16:09:32 +08:00
zhaokaiyao@91isoft.com 3f9e7205fd 使用标准表实施日期,不使用国家清单实施日期 2021-09-13 16:05:26 +08:00
zhaokaiyao@91isoft.com dd247c2caf 企标英文名称模糊查询 2021-09-13 15:06:07 +08:00
zhaokaiyao@91isoft.com 200adfcc65 导入数据时,标准类别不存在时新增 2021-09-13 09:06:47 +08:00
zhaokaiyao@91isoft.com fe072412d9 属性字段初始化 2021-09-10 17:40:29 +08:00
zhaokaiyao@91isoft.com 61be8c0aaa excl批量导入标准 添加搜索中心 2021-09-10 15:59:10 +08:00
zhaokaiyao@91isoft.com ea9e2b31cc excl批量导入标准 2021-09-09 23:06:19 +08:00
zhaokaiyao@91isoft.com 77c274b724 commit 2021-09-09 22:29:34 +08:00
zhaokaiyao@91isoft.com 6cf59f9a45 暴力UNION 去重 2021-09-09 22:05:41 +08:00
zhaokaiyao@91isoft.com 3c5c0e4847 详情,实施日期多个 2021-09-09 21:04:04 +08:00
zhaokaiyao@91isoft.com 6aad71715c commit 2021-09-09 19:44:48 +08:00
zhaokaiyao@91isoft.com a69f009002 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-09 19:42:15 +08:00
zhaokaiyao@91isoft.com 346f35f548 预警 再实施日期到达预警期限时,新车型和在产车实施日期不在预警期限,取消不显示 2021-09-09 19:39:01 +08:00
yuezhihang f6933d2cc3 程序异常解决 2021-09-09 19:15:07 +08:00
super_liu 347e3e9339 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!166
 2021-09-09 18:05:19 +08:00
zhaokaiyao@91isoft.com bc4cc05f24 标准左侧数排序 2021-09-09 17:56:39 +08:00
zhaokaiyao@91isoft.com 5089cbb59d Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-09 17:25:45 +08:00