 super_liu
|
4e398027eb
|
feat: 国内外标准 编辑入es库 问题修改
|
2021-08-02 17:44:16 +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
|
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
|
589b31aa4d
|
注掉部分超哥代码 使程序先跑起来
|
2021-07-30 09:32:24 +08: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 |
|
|
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
|
0b069efd95
|
feat: 国内外标准 多文档 操作 及 删除 国家属性字段
|
2021-07-28 16:14:52 +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 |
|
|
super_liu
|
f0fd398fee
|
feat: 1
|
2021-07-27 18:25:36 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
5bb3959002
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-27 10:43:17 +08:00 |
|
|
super_liu
|
387a97a46c
|
feat: 树查询国内外标准
|
2021-07-27 09:50:47 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f4c7b2ba68
|
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-26 20:12:12 +08:00 |
|
|
super_liu
|
5a8cad6e09
|
feat: 国内外标准库
|
2021-07-26 18:30:54 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6c4ad93812
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-26 10:10:24 +08:00 |
|
|
super_liu
|
2ba81296da
|
feat: 标准库MQ
|
2021-07-26 09:51:12 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3154533fb8
|
修复了收藏后重新编辑数据,收藏的数据没有更新问题
优化逻辑,取消收藏时(逻辑删除),再次收藏此数据,由之前的添加一条新收藏的数据更改为更新原来数据的逻辑删除字段值
|
2021-07-25 16:51:59 +08:00 |
|
|
super_liu
|
7db2b79b63
|
feat: 首页标准发布
|
2021-07-19 16:29:52 +08:00 |
|
|
super_liu
|
63181803aa
|
feat: 标准库
|
2021-07-18 17:10:35 +08:00 |
|
|
super_liu
|
de97f459fd
|
feat: 标准入库流程 带入 逻辑
|
2021-07-15 17:14:54 +08:00 |
|
|
super_liu
|
9930cbae9b
|
feat: 添加企业标准库 接口服务
|
2021-07-13 14:25:06 +08:00 |
|
|
super_liu
|
51ed1c269d
|
feat: 标准库 详情 文件类 修改
|
2021-07-12 18:09:24 +08:00 |
|
|
super_liu
|
f41d94bbd9
|
feat: 标准文本信息上传
|
2021-07-12 11:02:11 +08:00 |
|
|
super_liu
|
48933b44dc
|
feat: 入库流程 属性字段对应
|
2021-07-10 15:43:35 +08:00 |
|
|
super_liu
|
c06cb07db6
|
feat: 标准库 体系树形结构等
|
2021-07-09 18:16:10 +08:00 |
|
|
super_liu
|
e067c8ae61
|
feat: 标准库 左侧树 相关 配置标准 相关等
|
2021-07-08 22:34:07 +08:00 |
|
|
super_liu
|
bd73773b19
|
feat: 国内外标准 树形结构查询标准库
|
2021-07-06 16:05:27 +08:00 |
|
|
super_liu
|
75a7a90e9d
|
Merge branch 'develop_master' into develop_3
|
2021-07-05 11:10:43 +08:00 |
|
|
root
|
1f9f5ac2fa
|
查询机构人员
|
2021-07-04 16:45:52 +08:00 |
|
|
yinglong zhang
|
89a7a5ee7f
|
feat 合并分支
|
2021-06-24 17:50:12 +08:00 |
|
|
yinglong zhang
|
31ee78f374
|
feat 合并分支
|
2021-06-24 17:39:01 +08:00 |
|
|
super_liu
|
006fb9a1f4
|
feat: 标准入库流程
|
2021-06-23 18:11:55 +08:00 |
|
|
赵肖云
|
a1503fd90f
|
fetch:UUID修改
|
2021-06-23 09:22:55 +08:00 |
|
|
super_liu
|
bd01b11ea8
|
Merge branch 'develop_master' into develop_3
# Conflicts:
# adc-da-slrs/src/main/resources/mybatis/mapper/SarCompResAssess/SarCompResAssessMapper.xml
|
2021-06-22 18:15:00 +08:00 |
|
|
super_liu
|
12d9bd7b51
|
feat: 标准入库
|
2021-06-22 18:07:08 +08:00 |
|
|
yinglong zhang
|
bb5657ca40
|
feat 解决冲突
|
2021-06-22 17:34:38 +08:00 |
|
|
2510220824
|
51d3edebfd
|
add:集成es搜索模块
|
2021-06-22 17:14:39 +08:00 |
|
|
super_liu
|
c3f912eefb
|
feat: 流程入库 及 杂七杂八
|
2021-06-21 18:36:52 +08:00 |
|
|
super_liu
|
37930e0b07
|
feat: 标准实体
|
2021-06-17 11:32:28 +08:00 |
|
|
yinglong zhang
|
4ffd46b830
|
add 添加标准合规评估结果接口
|
2021-06-16 17:03:34 +08:00 |
|
|
super_liu
|
9d704f4d1e
|
feat: 迁移标准属性自定义 修改相关问题
|
2021-06-15 18:45:21 +08:00 |
|
|
super_liu
|
b8dc259f15
|
feat: 迁移国内标准法规部分6 详情 下载 标准查询
|
2021-06-05 01:07:57 +08:00 |
|
|
super_liu
|
7ae47063b4
|
feat: 迁移国内标准法规部分5 标准号验证 导入 导出
|
2021-06-04 22:53:52 +08:00 |
|
|
super_liu
|
1a7289f016
|
feat: 1
|
2021-06-04 13:59:07 +08:00 |
|
|
super_liu
|
6bd02d963b
|
feat: 注释掉登录验证
|
2021-06-04 00:02:26 +08:00 |
|
|
super_liu
|
3666dda9de
|
feat: 迁移国内标准法规部分4 国内标准法规-删除功能
|
2021-06-03 14:16:02 +08:00 |
|
|
super_liu
|
aded9a3e47
|
feat: 迁移国内标准法规部分3 修改国内标准法规
|
2021-06-03 13:59:17 +08:00 |
|
|
super_liu
|
4caa481d31
|
feat: 迁移国内标准法规部分2 创建国内标准法规
|
2021-06-03 13:39:40 +08:00 |
|
|
super_liu
|
4cc558befc
|
feat: 迁移国内标准法规部分1
|
2021-06-02 21:39:20 +08:00 |
|