Commit Graph
487 Commits
Author SHA1 Message Date
yuezhihang 690d86a4b8 项目查询以及代码精简 2021-08-17 09:37:46 +08:00
zhaokaiyao@91isoft.com 68d7a1ab66 添加了注释 2021-08-16 16:16:37 +08:00
zhaokaiyao@91isoft.com 1acf15280e Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-08-16 16:13:17 +08:00
zhaokaiyao@91isoft.com 32626f3ae1 过内外标准高级搜索 2021-08-16 16:13:04 +08:00
yuezhihang fbefe71f1c 评估结果 2021-08-16 15:43:26 +08:00
yuezhihang 86db5270e4 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-16 15:12:54 +08:00
Mr.Z 241d14bac4 标准合规评估流程 项目评估结果后台查询bug~~~~ 2021-08-16 15:01:03 +08:00
yuezhihang 5bbc0e175f Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-16 14:57:44 +08:00
yuezhihang 99d5706184 解读入库 2021-08-16 14:57:34 +08:00
super_liu 0f202d6e32 Merge branch 'develop_3' into 'develop_master'
feat: There is no way the Search Add Stand ES

See merge request !112
2021-08-16 05:57:41 +00:00
super_liu a5ae69996d feat: There is no way the Search Add Stand ES 2021-08-16 13:56:49 +08:00
shen_yan_pu bb283d79c7 清单查询 2021-08-16 11:08:30 +08:00
yuezhihang 44a24c23b1 项目维度 筛选标准 2021-08-13 18:28:28 +08:00
yuezhihang c660c36d40 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-13 16:44:17 +08:00
yuezhihang 699b1ef9c4 车型项目库查询bug 2021-08-13 16:44:09 +08:00
super_liu ecb5d3a67e Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request !109
2021-08-13 08:43:49 +00:00
super_liu 8b74f8bb24 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-08-13 15:44:41 +08:00
super_liu fbf1d49065 feat: There is no way the 2021-08-13 15:43:49 +08:00
zhaokaiyao@91isoft.com 0142c3fe85 国内外标准排序 2021-08-13 13:48:42 +08:00
yuezhihang 3327223c25 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-13 09:06:16 +08:00
yuezhihang 9f0ed13874 合规评估项目数据过滤 2021-08-12 18:08:29 +08:00
Mr.Z bfc9995aad Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-12 18:06:14 +08:00
Mr.Z 26ffa2d7af 标准合规评估流程 字段修改 2021-08-12 18:02:28 +08:00
yuezhihang 5254f397b8 项目评估流程 2021-08-12 18:00:46 +08:00
yanyizhou 249f6bd1eb 零部件编号申请模块开发完成 2021-08-12 17:57:33 +08:00
yuezhihang 514bf18667 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-12 14:54:01 +08:00
yuezhihang 3c27f20db3 修改分解单状态 2021-08-12 14:53:54 +08:00
shen_yan_pu 57bfe507ef 清单导出字段修改 2021-08-12 14:27:20 +08:00
shen_yan_pu 0ae192be2f 修改标准清单的实施日期字段 2021-08-12 10:40:17 +08:00
yuezhihang f43ac650e0 标准合规评估流程 产品线不显示bug修复 2021-08-12 09:29:24 +08:00
yuezhihang cdf9e16f1d Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-12 09:06:22 +08:00
super_liu dfc86922f2 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request !105
2021-08-11 09:42:05 +00:00
super_liu b7e9cc3061 feat: 新增 convert 转换pdf子项目 2021-08-11 17:40:26 +08:00
zhaokaiyao@91isoft.com 2107728ce8 最新 2021-08-11 14:42:09 +08:00
zhaokaiyao@91isoft.com 530a6febf6 查看分解单字段修改 2021-08-11 13:36:50 +08:00
2510220824 13d51ae2a1 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-11 13:34:29 +08:00
2510220824 b14a80c7a4 add:新增同步车型项目,组织数据接口 2021-08-11 13:33:42 +08:00
yanyizhou 10c81b533d Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-10 19:19:45 +08:00
yanyizhou 3f66b95e94 拆分 2021-08-10 19:19:29 +08:00
Mr.Z 9773e51ef0 添加字段条款名称 2021-08-10 18:34:16 +08:00
yanyizhou d9eaa9d7b1 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-10 18:15:49 +08:00
yuezhihang fb860e347d 解读入库 2021-08-10 17:57:03 +08:00
yanyizhou d43443640c Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-10 16:01:41 +08:00
yanyizhou 7c74df6030 零部件模块 2021-08-10 16:00:57 +08:00
super_liu 7af19a8dca Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-10 14:56:55 +08:00
super_liu 8ccbd447be feat:There is no way the 2021-08-10 14:55:53 +08:00
yuezhihang e52f316a59 标准总数返回
!!!!!
2021-08-10 14:49:44 +08:00
yuezhihang ca80dd9feb Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
2021-08-09 17:55:11 +08:00
yuezhihang 3dd392b411 过滤数据!!! 2021-08-09 17:52:01 +08:00
super_liu faac8f3683 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-09 17:32:22 +08:00