FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
400 Commits 1 Branch 0 Tags
0d2ac245b2add5d4ebfca59f39b8e0baf4d1ce5c
Commit Graph
400 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王夏晖 0d2ac245b2 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !76
 2021-07-30 01:01:28 +00:00
super_liu 502e83de9d Merge branch 'develop_3' into 'develop_master' 
feat: 国内外标准 反向标准显示逻辑

See merge request !75
 2021-07-29 16:55:10 +00:00
super_liu 00894cbeef Merge branch 'develop_master' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-07-30 00:54:34 +08:00
super_liu d7f3fc9f95 feat: 国内外标准 反向标准显示逻辑 2021-07-30 00:48:48 +08:00
zzy dd281f63ad Update：清单高级检索 2021-07-29 16:59:25 +08:00
zzy 7d5fc79555 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-07-29 16:58:46 +08:00
Wanghong f9d39e5e2d 修改未符合项模糊查询bug 2021-07-29 16:37:58 +08:00
Wanghong a40bada8ab 修改未符合项模糊查询bug 2021-07-29 16:29:11 +08:00
Wanghong 502aff8539 修改未符合项字段bug 2021-07-29 16:15:57 +08:00
Wanghong 72d954db68 修改未符合项字段bug 2021-07-29 16:13:00 +08:00
yuezhihang a017d3acd6 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-29 15:22:23 +08:00
yuezhihang 534caf3bdb 政策状态修改 ！！！ 查询bug修复 2021-07-29 15:21:53 +08:00
zzy 9d3d8e1198 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-07-29 15:19:39 +08:00
zzy 0779f2c8e9 update：未符合整改项导出 2021-07-29 15:07:07 +08:00
yuezhihang 60dbb8faeb 配置中新 bug修复 和 角色管理bug修复 2021-07-29 14:02:40 +08:00
zzy 80226d5cfb update：修改清单信息 2021-07-29 11:14:47 +08:00
yuezhihang af1c3227f6 项目库 1 2021-07-29 10:13:27 +08:00
yuezhihang cabdf7a712 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
 2021-07-29 09:42:14 +08:00
yuezhihang 5366e15b4b Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-29 09:39:42 +08:00
yuezhihang a7c7142789 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-29 09:36:45 +08:00
王夏晖 de1fe704a8 Update application-dev.properties 2021-07-28 14:25:50 +00:00
Wanghong cacc66d5e7 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-07-28 18:10:28 +08:00
Wanghong bf0f7b7f4c 修改未符合项模糊查询bug 2021-07-28 18:09:44 +08:00
王夏晖 a5d0229b5b Update application-dev.properties 2021-07-28 09:17:14 +00:00
super_liu e434216c15 Merge branch 'develop_3' into 'develop_master' 
feat:     exist=false 国家属性字段

See merge request !69
 2021-07-28 08:18:47 +00:00
super_liu 474fe6fd45 feat: exist=false 国家属性字段 2021-07-28 16:18:17 +08:00
super_liu 31a14da9db Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !68
 2021-07-28 08:16:16 +00:00
super_liu c9484a822f Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-28 16:15:07 +08:00
super_liu 0b069efd95 feat: 国内外标准 多文档 操作 及 删除 国家属性字段 2021-07-28 16:14:52 +08:00
zj 734a4e7421 update:解决车型项目库项目标号回显错误的BUG 2021-07-28 15:55:53 +08:00
2510220824 935a47d1f1 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-28 15:36:42 +08:00
2510220824 de8f5631c0 add:升级es到7.6.2 2021-07-28 15:35:45 +08:00
zhaokaiyao@91isoft.com 3adc08d178 水印取消工号内容 2021-07-28 15:30:48 +08:00
王夏晖 a991f1550c Merge branch 'develop_1' into 'develop_master' 
update：修改sql语句

See merge request !65
 2021-07-28 06:18:22 +00:00
zzy 6dc14af762 update：修改sql语句 2021-07-28 14:05:11 +08:00
王夏晖 e237170f61 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !64
 2021-07-28 02:49:56 +00:00
yuezhihang f862fbf2cd Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-28 10:45:28 +08:00
zzy b3630e8ad6 update：修复导出 2021-07-28 10:10:25 +08:00
Wanghong 2428b39e79 修改未符合项bug 2021-07-28 09:23:44 +08:00
zhaokaiyao@91isoft.com b98c8291bd 水印添加了时间 2021-07-28 09:07:48 +08:00
super_liu d990c840e4 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !63
 2021-07-27 12:35:22 +00:00
super_liu f0fd398fee feat: 1 2021-07-27 18:25:36 +08:00
zhaokaiyao@91isoft.com 66d54c3684 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-27 18:02:03 +08:00
zhaokaiyao@91isoft.com 9f82519e1c 最新 2021-07-27 18:01:28 +08:00
王夏晖 385870df42 Merge branch 'develop_1' into 'develop_master' 
update：修改标准查询

See merge request !62
 2021-07-27 09:30:09 +00:00
zzy 0540325f35 update：修改标准查询 2021-07-27 17:04:30 +08:00
王夏晖 7dbd402cb0 Merge branch 'develop_1' into 'develop_master' 
update：标准征求意见增加字段

See merge request !61
 2021-07-27 08:29:44 +00:00
zhaokaiyao@91isoft.com 01126cc1d4 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-27 16:24:24 +08:00
zhaokaiyao@91isoft.com 32afc5475f Revert "修复了海外标准法规，配置标准后，在此节点没有显示此标准的问题" 
This reverts commit 9cd93436
 2021-07-27 16:18:58 +08:00
zj f23df40628 update:车型项目库导出 2021-07-27 15:55:51 +08:00