FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,802 Commits 1 Branch 0 Tags
06c14bd8cd54af524f44094de2a83e25fd7839f5
Commit Graph
1802 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang 7d4dcf561a 查询总数 错误bug 2021-08-12 16:22:36 +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
super_liu 3c2eed2ed4 feat: There is no way the 2021-08-12 11:18:43 +08:00
shen_yan_pu 98456a09f3 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-12 11:10:43 +08:00
super_liu 692f9ee9ff Merge branch 'develop_3' into 'develop_master' 
feat: There is no way the

See merge request !108
 2021-08-12 03:09:24 +00:00
super_liu 3f606017e9 feat: There is no way the 2021-08-12 11:08:37 +08:00
super_liu c575c85215 Merge branch 'develop_3' into 'develop_master' 
feat: 新增 convert 转换pdf子项目 MQ

See merge request !107
 2021-08-12 03:07:45 +00:00
super_liu bf800309c4 feat: 新增 convert 转换pdf子项目 MQ 2021-08-12 11:06:42 +08:00
shen_yan_pu 0ae192be2f 修改标准清单的实施日期字段 2021-08-12 10:40:17 +08:00
yanyizhou 7051de09cc Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-12 09:57:28 +08:00
Mr.Z 0325b6b7ee Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-12 09:48:53 +08:00
Mr.Z f3285453bf Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-12 09:42:35 +08:00
yanyizhou 7071cb23c8 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-12 09:40:39 +08:00
yanyizhou 86ca149885 GIT 2021-08-12 09:40:16 +08:00
yuezhihang f43ac650e0 标准合规评估流程 产品线不显示bug修复 2021-08-12 09:29:24 +08:00
yuezhihang 0326e66b54 启动bug修复 2021-08-12 09:13:06 +08:00
yuezhihang cdf9e16f1d Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-12 09:06:22 +08:00
Mr.Z db5ea125fb Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-11 23:06:47 +08:00
Mr.Z 1374bc5807 zyh自用 2021-08-11 23:03:40 +08:00
super_liu ae553d92af Merge branch 'develop_3' into 'develop_master' 
feat:There is no way the

See merge request !106
 2021-08-11 09:51:07 +00:00
super_liu 9cdf37713f feat:There is no way the 2021-08-11 17:50:25 +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
super_liu 2f0c627d88 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-08-11 17:20:48 +08:00
super_liu e93edf3bbb feat: 新增 convert 转换pdf子项目 2021-08-11 17:19:57 +08:00
zhaokaiyao@91isoft.com 2107728ce8 最新 2021-08-11 14:42:09 +08:00
yuezhihang 440bb7d038 标准总数返回 
！！！！！
 2021-08-11 14:23:49 +08:00
yuezhihang 8c92abab31 过滤数据！！！ 2021-08-11 14:23:49 +08:00
zhaokaiyao@91isoft.com 21b3158070 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-08-11 13:56:08 +08:00
王夏晖 79ca8606f7 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !104
 2021-08-11 05:46:41 +00:00
yuezhihang def09cd38a 标准总数返回 
！！！！！
 2021-08-11 13:39:25 +08:00
yuezhihang adb039fa98 过滤数据！！！ 2021-08-11 13:39:20 +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
super_liu 9b2b0145c0 Merge branch 'develop_3' into 'develop_master' 
最新

See merge request !103
 2021-08-11 01:32:42 +00:00
zhaokaiyao@91isoft.com 8a11249b07 最新 2021-08-10 20:21:22 +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
yanyizhou b9c6899e55 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-10 18:15:38 +08:00
yuezhihang fb860e347d 解读入库 2021-08-10 17:57:03 +08:00
yuezhihang 90c39fab34 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-10 17:44:56 +08:00
yanyizhou 9af7f462f5 Merge remote-tracking branch 'origin/master' into develop_1 
# Conflicts:
#	adc-da-main/src/main/resources/application-dev.properties
 2021-08-10 17:29:51 +08:00
Mr.Z 5cb1fd52cc 分解单字段修改 2021-08-10 17:29:07 +08:00
super_liu 271e8860d6 feat:There is no way the issueTime sort desc 2021-08-10 17:23:00 +08:00
super_liu 6c351c1d33 feat:There is no way the 2021-08-10 16:29:42 +08:00