 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 |
|
|
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 |
|
|
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 |
|
|
zhaokaiyao@91isoft.com
|
1de5c838d0
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-27 09:34:43 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
zhaokaiyao@91isoft.com
|
66f9763b96
|
添加了修改第三方链接排序接口
|
2021-07-23 15:00:47 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6c7baa65af
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-22 14:53:08 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2ca543d981
|
添加岗位时,设置操作时间为当前系统时间
|
2021-07-22 14:52:11 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b3f9244345
|
修改了国内法规导出excl表单的字段
|
2021-07-22 10:58:22 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7618db7a47
|
("/${restPath}/person/personCollect")添加收藏,查询收藏,取消收藏
|
2021-07-21 15:18:58 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
706b6ce264
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-21 11:35:58 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
5825d8793f
|
修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部
添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员
添加getFirstInstitution()接口,返回机构第一级目录
|
2021-07-21 11:30:44 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
4cee0f6bf5
|
修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部
添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员
添加getFirstInstitution()接口,返回机构第一级目录
|
2021-07-21 10:03:49 +08:00 |
|