FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
875 Commits 1 Branch 0 Tags
81a65fcf36b0680b39b780ee463d0e4471588cfa
Commit Graph
875 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang 81a65fcf36 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-07 09:22:34 +08:00
super_liu 4db5ad822f Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!155
 2021-09-07 09:18:08 +08:00
zhaokaiyao@91isoft.com 8f91325053 excl标准写入并导出错误excl表 2021-09-07 08:45:35 +08:00
yuezhihang 02f54162d1 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-06 18:30:08 +08:00
yuezhihang fa2417d51e Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-06 18:29:54 +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 abad09c2ea Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!154
 2021-09-06 18:02:32 +08:00
super_liu 6683829f31 feat: There is no way the #47671 2021-09-06 18:01:09 +08:00
super_liu e85d3daecb feat: There is no way the #47611 2021-09-06 17:42:34 +08:00
super_liu 5400f5c35d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!153
 2021-09-06 15:04:21 +08:00
zhaokaiyao@91isoft.com 307e6ddd85 commit 2021-09-06 14:29:04 +08:00
super_liu 465af62026 feat: There is no way the convert 4.3 2021-09-06 13:43:44 +08:00
super_liu 08462efc0e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!152
 2021-09-06 09:35:25 +08:00
yanyizhou 34c73432b9 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-06 09:29:45 +08:00
yanyizhou 182b4bcf72 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-06 09:29:42 +08:00
yuezhihang 299c91d03e Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-06 09:12:50 +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 92207379fc Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-04 16:43:36 +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
yanyizhou 1909b24bbc Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-04 10:23:58 +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
王夏晖 e405a811b8 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!150
 2021-09-04 09:50:49 +08:00
yanyizhou 7ba6efe95f Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-03 17:25:18 +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
yuezhihang 8ce701cc82 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-03 09:24:42 +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
yanyizhou 42491993a6 Merge remote-tracking branch 'origin/develop_3' into develop_1 2021-09-02 21:22:45 +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
yuezhihang ae1c70b140 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-02 17:31:44 +08:00
Mr.Z 0e8238267c 车型项目库的清单版本~~ 2021-09-02 17:29:19 +08:00
super_liu 93795007e7 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request !146
 2021-09-02 08:58:05 +00: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