FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,156 Commits 1 Branch 0 Tags
541c93a5bb7027c001196110778b878f52d4e1fc
Commit Graph
749 Commits
Author SHA1 Message Date
super_liu f7497d48bc feat: There is no way the #47672 2021-09-07 17:04:53 +08:00
Mr.Z 84190c9ddc 项目合规评估流程-项目 入到标准合规评估结果 里面 产品线、项目编号、项目名称没传值~~ 2021-09-07 16:55:28 +08:00
yuezhihang 7471709e1d Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-07 09:52:18 +08:00
yuezhihang 9729d04588 数据同步 2021-09-07 09:51:59 +08:00
Mr.Z 5d56dd4151 岗位管理新增查询功能以及分页功能~~ 2021-09-07 09:29:23 +08:00
zhaokaiyao@91isoft.com 7ede6c69af commit 2021-09-07 09:24:41 +08:00
yuezhihang 81a65fcf36 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-07 09:22:34 +08:00
zhaokaiyao@91isoft.com 8f91325053 excl标准写入并导出错误excl表 2021-09-07 08:45:35 +08:00
yanyizhou 446f8f54e9 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-06 18:29:25 +08:00
yanyizhou 912cda6762 配置管理 机构管理 查询加分页 2021-09-06 18:29:10 +08:00
zhaokaiyao@91isoft.com 0c1a57a345 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-06 18:15:17 +08:00
zhaokaiyao@91isoft.com 16e38bd98d excl标准写入 2021-09-06 18:14:54 +08:00
super_liu e85d3daecb feat: There is no way the #47611 2021-09-06 17:42:34 +08:00
zhaokaiyao@91isoft.com 307e6ddd85 commit 2021-09-06 14:29:04 +08:00
yanyizhou 34c73432b9 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-06 09:29:45 +08:00
zhaokaiyao@91isoft.com f65755b470 commit 2021-09-05 10:30:54 +08:00
zhaokaiyao@91isoft.com cee53b3df0 commit 2021-09-04 22:32:14 +08:00
zhaokaiyao@91isoft.com 75ef2d52bc 文本状态更新被代替,废止根据代替标准号 2021-09-04 22:29:15 +08:00
zhaokaiyao@91isoft.com 3146a6752d Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-04 16:44:31 +08:00
zhaokaiyao@91isoft.com 0ed76406b2 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-04 16:44:20 +08:00
yuezhihang b5414c7bf1 老数据 读取 2021-09-04 16:43:27 +08:00
zhaokaiyao@91isoft.com 2e83db6d98 文本状态更新被代替,废止 2021-09-04 15:07:15 +08:00
Mr.Z c48c311d3c 车型项目库的清单版本时间格式修改~~ 2021-09-04 11:22:37 +08:00
zhaokaiyao@91isoft.com 28e8ba6c88 企标导出excl 标准状态->文本状态 2021-09-04 10:16:19 +08:00
zhaokaiyao@91isoft.com 19c52a212b 解决企标高级搜索,putTime,issuTime,textStatusBuss失效的问题 2021-09-04 10:09:40 +08:00
zhaokaiyao@91isoft.com da7826f004 企标excl导出 日期出现异常 2021-09-04 10:07:44 +08:00
yanyizhou 1f2d738ee3 机构管理--加筛选条件：姓名和邮箱 2021-09-03 17:24:59 +08:00
yanyizhou 08c19dd1f4 /api/sarStandProjectLibrary/save 接口 2021-09-03 10:47:37 +08:00
zhaokaiyao@91isoft.com fcc74a17dc save sar_stand_project_team 2021-09-03 09:12:58 +08:00
yanyizhou 0b97292bca 实现 /api/sarStandProjectLibrary/save 接口 2021-09-02 22:55:43 +08:00
zhaokaiyao@91isoft.com 4acf662b1a Merge remote-tracking branch 'origin/develop_1' into develop_3 2021-09-02 21:21:25 +08:00
yanyizhou 1033aecfa4 Merge remote-tracking branch 'origin/develop_3' into develop_1 2021-09-02 21:20:45 +08:00
yanyizhou b72ed741f0 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-02 21:20:16 +08:00
zhaokaiyao@91isoft.com 9251c7a28b Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-02 21:07:17 +08:00
zhaokaiyao@91isoft.com e8dd9f42cb save sar_stand_project_team 2021-09-02 21:06:40 +08:00
Mr.Z 0e8238267c 车型项目库的清单版本~~ 2021-09-02 17:29:19 +08:00
super_liu a8158890c1 Merge branch 'develop_master' into develop_migration 2021-09-02 16:57:24 +08:00
super_liu a94b3bea68 feat: There is no way the 2021-09-02 16:54:04 +08:00
Mr.Z 7d0c3a3a9a Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-02 16:49:29 +08:00
yuezhihang 5c246ba9b4 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-02 16:44:15 +08:00
zhaokaiyao@91isoft.com 3d5abafdb0 查询文本信息2.0 2021-09-02 10:43:11 +08:00
Mr.Z 2e6edf615b 标准预警修改~~ 2021-09-02 10:17:28 +08:00
yanyizhou ee85f48542 开耀和宇欢冲突之后的合并代码 2021-09-01 14:25:16 +08:00
yanyizhou fc608845d8 Merge remote-tracking branch 'origin/develop_master' into develop_1 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
 2021-09-01 11:19:57 +08:00
yanyizhou e86f5cfbe7 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-01 11:12:29 +08:00
zhaokaiyao@91isoft.com c60ba3c14e Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-08-31 21:39:44 +08:00
zhaokaiyao@91isoft.com f48869a1d5 标准预警,判断标准在产车实施日期和新车型实施日期是否在预警期限内 2021-08-31 21:39:18 +08:00
yuezhihang 4277e819f2 因排序导致无法去重 2021-08-31 16:12:29 +08:00
zhaokaiyao@91isoft.com a843354794 预警标准时设itemsId为'-1' 
更改唯一性约束
 2021-08-31 14:47:54 +08:00
zhaokaiyao@91isoft.com 8040cc0711 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-08-31 14:04:42 +08:00