 zhaokaiyao@91isoft.com
|
9b5bf72fad
|
文件后缀大写
|
2021-10-17 14:26:44 +08:00 |
|
|
王夏晖
|
60060cce55
|
Merge branch 'develop_master' into 'dev_wangxiahui'
Develop master
See merge request LiuChao/foton-slrs-system-rest!185
|
2021-09-28 18:21:07 +08:00 |
|
|
2510220824
|
8e8bb38d07
|
add:增加IDM单点登录及修改服务认证
|
2021-09-28 18:13:27 +08:00 |
|
|
yuezhihang
|
9729d04588
|
数据同步
|
2021-09-07 09:51:59 +08:00 |
|
|
super_liu
|
ea473ee500
|
feat: There is no way the ocr
|
2021-08-31 18:02:50 +08:00 |
|
|
super_liu
|
99c32a2d7f
|
feat: There is no way the convert
|
2021-08-30 15:08:55 +08:00 |
|
|
super_liu
|
71aba6aa2d
|
feat: There is no way the
|
2021-08-25 17:20:45 +08:00 |
|
|
2510220824
|
81799abfb1
|
add:修改ocr回调文件存储
|
2021-08-25 09:22:45 +08:00 |
|
|
2510220824
|
5d7f3195e3
|
add:修改restTemplate配置
|
2021-08-24 14:24:14 +08:00 |
|
|
2510220824
|
f58bbd0c01
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-24 13:32:42 +08:00 |
|
|
2510220824
|
bf8a247cf2
|
add:ocr请求替换为okhttp
|
2021-08-24 13:30:39 +08:00 |
|
|
super_liu
|
6084f51bae
|
feat: There is no way the
|
2021-08-24 09:57:11 +08:00 |
|
|
yanyizhou
|
4ea16d31c5
|
岳志航改的bug
|
2021-08-08 10:17:38 +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
|
534caf3bdb
|
政策状态修改 ！！！ 查询bug修复
|
2021-07-29 15:21:53 +08:00 |
|
|
yuezhihang
|
60dbb8faeb
|
配置中新 bug修复 和 角色管理bug修复
|
2021-07-29 14:02:40 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3adc08d178
|
水印取消工号内容
|
2021-07-28 15:30:48 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b98c8291bd
|
水印添加了时间
|
2021-07-28 09:07:48 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
9f82519e1c
|
最新
|
2021-07-27 18:01:28 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
32afc5475f
|
Revert "修复了海外标准法规，配置标准后，在此节点没有显示此标准的问题"
This reverts commit 9cd93436
|
2021-07-27 16:18:58 +08:00 |
|
|
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
|
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
|
ccfbc541d5
|
feat: 企业标准库 迁移2
|
2021-07-26 11:12:16 +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
|
7618db7a47
|
("/${restPath}/person/personCollect")添加收藏,查询收藏,取消收藏
|
2021-07-21 15:18: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 |
|
|
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
|
a535f138d9
|
Merge branch 'develop_3' into 'develop_master'
feat: 标准库 体系树形结构等
See merge request !19
|
2021-07-09 10:17:43 +00:00 |
|
|
super_liu
|
c06cb07db6
|
feat: 标准库 体系树形结构等
|
2021-07-09 18:16:10 +08:00 |
|
|
duanwenbin
|
2e8a2bba51
|
提交本地工具-标准拆分相关接口
|
2021-07-08 11:21:18 +08:00 |
|
|
duanwenbin
|
c1a0b31372
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
# adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
|
2021-07-07 11:23:08 +08:00 |
|
|
duanwenbin
|
9709acf0a9
|
提交本地工具模块相关代码
|
2021-07-07 11:21:42 +08:00 |
|
|
yinglong zhang
|
9a00280ba0
|
feat 改回注册中心配置
|
2021-07-07 09:53:29 +08:00 |
|
|
root
|
1ea0d09cb0
|
fetch:机构人员bug
|
2021-07-06 17:30:30 +08:00 |
|
|
root
|
011b5e247a
|
同步代码
|
2021-07-05 10:32:41 +08:00 |
|
|
yinglong zhang
|
531bb9e7ce
|
feat 合并分支
|
2021-07-04 16:41:37 +08:00 |
|
|
2510220824
|
3e69a462b0
|
add:IDM组织、人员数据同步
|
2021-07-04 13:57:56 +08:00 |
|
|
super_liu
|
d957107510
|
Merge branch 'develop_3' into 'develop_master'
feat: 登陆修改
See merge request !13
|
2021-06-23 07:26:03 +00:00 |
|
|
super_liu
|
fa985d2d58
|
feat: 登陆修改
|
2021-06-23 15:25:41 +08:00 |
|
|
super_liu
|
e985820f27
|
Merge branch 'develop_3' into 'develop_master'
Develop 3 提交
See merge request !12
|
2021-06-22 10:12:39 +00:00 |
|
|
super_liu
|
c3f912eefb
|
feat: 流程入库 及 杂七杂八
|
2021-06-21 18:36:52 +08:00 |
|
|
super_l_test
|
3489367a24
|
feat:文件上传
|
2021-06-21 10:57:02 +08:00 |
|
|
super_liu
|
a03db1068a
|
feat:1
|
2021-06-16 11:02:02 +08:00 |
|
|
super_liu
|
9d704f4d1e
|
feat: 迁移标准属性自定义 修改相关问题
|
2021-06-15 18:45:21 +08:00 |
|