 super_liu
|
22f5ea5eaf
|
feat: 修改updatePersonCollect接口
|
2021-07-27 11:19:30 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b182ad5885
|
最新
|
2021-07-27 11:05:42 +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
|
8fd8a7541b
|
Merge branch 'develop_master' into develop_3
|
2021-07-27 10:41:10 +08:00 |
|
|
super_liu
|
b5a53bf905
|
feat: es MQ 全局判断
|
2021-07-27 10:40:43 +08:00 |
|
|
super_liu
|
387a97a46c
|
feat: 树查询国内外标准
|
2021-07-27 09:50:47 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
1de5c838d0
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-27 09:34:43 +08:00 |
|
|
super_liu
|
ebedd9ee4c
|
feat: 200
|
2021-07-27 09:31:45 +08:00 |
|
|
super_liu
|
b3cc1704b2
|
feat: 200M 文件限制
|
2021-07-27 09:26:09 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b04e30f80d
|
修改了国外法规导出的excel表字段
|
2021-07-27 09:21:10 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
9d4600b96c
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-27 09:20:28 +08:00 |
|
|
super_liu
|
93f852fef4
|
Merge branch 'develop_master' into develop_3
|
2021-07-27 09:08:54 +08:00 |
|
|
super_liu
|
6f286d6ca5
|
Merge branch 'develop_1' into 'develop_master'
update：清单修改，时间查询
See merge request !57
|
2021-07-27 00:58:31 +00: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 |
|
|
zhaokaiyao@91isoft.com
|
9cd93436c4
|
修复了海外标准法规，配置标准后，在此节点没有显示此标准的问题
|
2021-07-26 20:07:38 +08:00 |
|
|
super_liu
|
7e50bf88b0
|
Merge branch 'develop_master' into develop_3
|
2021-07-26 18:31:43 +08:00 |
|
|
super_liu
|
5a8cad6e09
|
feat: 国内外标准库
|
2021-07-26 18:30:54 +08:00 |
|
|
zzy
|
ad2b29f072
|
update：清单修改，时间查询
|
2021-07-26 17:57:44 +08:00 |
|
|
王夏晖
|
bcb0106983
|
Merge branch 'develop_1' into 'develop_master'
update：清单查询，增加字段
See merge request !55
|
2021-07-26 08:14:51 +00:00 |
|
|
zzy
|
404730d522
|
update：清单查询，增加字段
|
2021-07-26 14:53:51 +08:00 |
|
|
super_liu
|
cb48c13635
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !54
|
2021-07-26 03:12:53 +00:00 |
|
|
super_liu
|
ccfbc541d5
|
feat: 企业标准库 迁移2
|
2021-07-26 11:12:16 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6c4ad93812
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-26 10:10:24 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2a41643617
|
只在pdf中添加水印
|
2021-07-26 10:10:14 +08:00 |
|
|
super_liu
|
d210e218ba
|
feat: 标准属性字段 默认排序
|
2021-07-26 10:07:55 +08:00 |
|
|
super_liu
|
923a3505bf
|
Merge branch 'develop_3' into 'develop_master'
feat: 标准库MQ
See merge request !53
|
2021-07-26 01:51:52 +00:00 |
|
|
super_liu
|
2ba81296da
|
feat: 标准库MQ
|
2021-07-26 09:51:12 +08:00 |
|
|
super_liu
|
c608e52226
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !52
|
2021-07-25 12:50:49 +00:00 |
|
|
super_liu
|
8a1c2b39c3
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-25 20:44:40 +08:00 |
|
|
super_liu
|
8a263964f6
|
feat: 企业标准库 迁移1
|
2021-07-25 20:41:38 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f609e3cece
|
恢复下载时添加水印接口
|
2021-07-25 18:22:41 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3154533fb8
|
修复了收藏后重新编辑数据,收藏的数据没有更新问题
优化逻辑,取消收藏时(逻辑删除),再次收藏此数据,由之前的添加一条新收藏的数据更改为更新原来数据的逻辑删除字段值
|
2021-07-25 16:51:59 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a5286c3686
|
标准属性自定义在国外法规里新增字段
|
2021-07-25 16:46:36 +08:00 |
|
|
王夏晖
|
f5ceeebbf6
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request !51
|
2021-07-24 01:49:13 +00:00 |
|
|
Wanghong
|
cf0d9f6c6d
|
修改条件查询标准涉及项目符合性清单BUG
|
2021-07-23 18:01:15 +08:00 |
|
|
Wanghong
|
f94fb9db0d
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-07-23 18:01:06 +08:00 |
|
|
Wanghong
|
a4e2dd227a
|
修改条件查询标准涉及项目符合性清单BUG
|
2021-07-23 18:00:24 +08:00 |
|
|
super_liu
|
25528d92a8
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !50
|
2021-07-23 08:03:18 +00:00 |
|
|
王夏晖
|
601799acf6
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request !49
|
2021-07-23 07:57:56 +00:00 |
|
|
zzy
|
1f57316d3e
|
update：解决冲突
|
2021-07-23 15:56:56 +08:00 |
|
|
zzy
|
33c71b10e8
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-07-23 15:56:18 +08:00 |
|
|
zj
|
84c8c949bb
|
update:优化sql one more time
|
2021-07-23 15:55:10 +08:00 |
|
|
zzy
|
3fb8bfafb9
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
|
2021-07-23 15:16:16 +08:00 |
|
|
zzy
|
06aa79e3f6
|
update：增加高级查询
|
2021-07-23 15:03:02 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
66f9763b96
|
添加了修改第三方链接排序接口
|
2021-07-23 15:00:47 +08:00 |
|
|
王夏晖
|
dc884c0162
|
Merge branch 'develop_1' into 'develop_master'
update:优化sql
See merge request !46
|
2021-07-23 06:56:07 +00:00 |
|
|
zj
|
8ec8db0437
|
update:优化sql
|
2021-07-23 14:51:45 +08:00 |
|
|
yuezhihang
|
8d1280d484
|
标准清单入库 bug修复
|
2021-07-23 12:51:27 +08:00 |
|
|
王夏晖
|
03723a1522
|
Merge branch 'develop_1' into 'develop_master'
update：回复配置文件
See merge request !44
|
2021-07-22 09:26:17 +00:00 |
|
|
zzy
|
c4e563081a
|
update：回复配置文件
|
2021-07-22 17:04:55 +08:00 |
|