 super_liu
|
4e398027eb
|
feat: 国内外标准 编辑入es库 问题修改
|
2021-08-02 17:44:16 +08:00 |
|
|
super_liu
|
d83c7359da
|
feat: 非国内外标准菜单标准表 添加注解
|
2021-08-02 10:58:59 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
bda7690807
|
最新
|
2021-07-31 22:29:40 +08:00 |
|
|
super_liu
|
de95dc63ae
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
|
2021-07-30 16:54:36 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d7a2285d75
|
Revert "最新"
This reverts commit 9f82519e
|
2021-07-30 16:26:27 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d71c4a81e1
|
Revert "修复了收藏后重新编辑数据,收藏的数据没有更新问题"
This reverts commit 3154533fb8.
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
|
2021-07-30 16:25:23 +08:00 |
|
|
yuezhihang
|
343913c799
|
标准清单入库 bug修复
|
2021-07-30 15:20:56 +08:00 |
|
|
yuezhihang
|
46a577ab7f
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-07-30 13:43:13 +08:00 |
|
|
yuezhihang
|
f9ee8ca41c
|
角色配置数据权限 bug修复 和 角色新增配置初始权限bug修复
|
2021-07-30 13:43:06 +08:00 |
|
|
王夏晖
|
9c9faf0ded
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request !79
|
2021-07-30 03:32:39 +00:00 |
|
|
Mr.Z
|
c458d52eef
|
修改数据库sar_stand_unqualified表中STAND_SERIAL_NUMBER字段的额外空格
|
2021-07-30 11:13:12 +08:00 |
|
|
zzy
|
883cc97720
|
Update：标准解读流程新增实例
|
2021-07-30 11:00:36 +08:00 |
|
|
zj
|
2e27eca0c2
|
update:解决车型项目库项目标准信息回显错误
|
2021-07-30 10:04:53 +08:00 |
|
|
yuezhihang
|
99321d38de
|
角色配置数据权限 bug修复
|
2021-07-30 09:57:51 +08:00 |
|
|
yuezhihang
|
589b31aa4d
|
注掉部分超哥代码 使程序先跑起来
|
2021-07-30 09:32:24 +08:00 |
|
|
王夏晖
|
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 |
|