FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,822 Commits 1 Branch 0 Tags
eb15c06699bef7b484101c40cc23c1913aa1ed7b
Commit Graph
89 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com f3101d6e74 企标详情 文本状态显示textStatusBussShow 2022-01-20 15:07:55 +08:00
zhaokaiyao@91isoft.com 36dbbec524 企业标准类别 2021-12-30 18:29:30 +08:00
zhaokaiyao@91isoft.com b8c494d4c5 国内外excel导出code转字符 2021-12-29 15:55:58 +08:00
zhaokaiyao@91isoft.com 057ce691d6 标准导出字典转换 2021-12-25 13:40:41 +08:00
super_liu ddbedc1b28 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!293
 2021-12-16 18:18:40 +08:00
super_liu 90d6c0d4cf feat: There is no way the, 2021-12-16 18:13:17 +08:00
yuezhihang 349c283db4 登陆人或责任人部门错误问题 已修复 （可能存在残留） 2021-12-16 16:56:53 +08:00
zj c73f9b50d4 修改文件上传默认路径 2021-12-15 19:54:18 +08:00
yuezhihang 0babd2b56f 统一修改了一下分页 2021-12-14 16:07:51 +08:00
yuezhihang 6db9220082 手机端查询人员数据 2021-12-13 17:49:33 +08:00
yuezhihang 301ba42d65 手机端查人接口 以及 部分涉及到开耀的接口 加了备注 我先改了一下 等开耀回来看一下 2021-12-13 16:17:25 +08:00
yuezhihang 01b503fda5 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-07 15:20:05 +08:00
yuezhihang 1edd95bccc Ocr部分bug 和工作组部分bug修复 2021-12-07 15:19:55 +08:00
zj a2d002d659 ocr回到附件名称斜杠转换，避免造成路径读取错误 2021-12-06 18:06:28 +08:00
yuezhihang 82aa2a1139 登录接口新增字段 上一级部门 id和名称 2021-12-06 17:05:37 +08:00
yuezhihang 58cbe73a09 登陆接口 新增返回字段-----部门id 和 部门名称 2021-12-06 15:39:10 +08:00
Superman_Main 5c4f8108d7 feat: There is no way the, 2021-11-27 19:50:56 +08:00
zhaokaiyao@91isoft.com 723569fbd7 标准类别排序相同顺序按名称排序 2021-11-21 10:21:25 +08:00
super_liu 332f226fbc Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!236
 2021-11-15 10:04:14 +08:00
zhaokaiyao@91isoft.com 3fee0547a4 标准excel导入 2021-11-15 09:59:24 +08:00
super_liu 4b9b44f050 feat: There is no way the, 2021-11-11 12:47:45 +08:00
super_liu 831f8d321a feat: There is no way the 2021-10-29 23:53:33 +08:00
super_liu 9eff2340a2 feat: There is no way the, TO optimize the query 2021-10-22 15:50:07 +08:00
zhaokaiyao@91isoft.com 4ebe597ed4 Merge remote-tracking branch 'origin/develop_master' into develop_3 
# Conflicts:
#	adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
 2021-10-20 14:53:46 +08:00
2510220824 900bcb9c14 add:福田生产环境配置 2021-10-20 14:36:20 +08:00
zhaokaiyao@91isoft.com ad91f84dfb 当前参数为标准类别时需要输入的code为name值 2021-10-20 14:33:21 +08:00
super_liu 91ff42cb12 feat: There is no way the user jwt 2021-10-18 12:45:02 +08:00
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