FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,935 Commits 1 Branch 0 Tags
183ba86528f31b5e58104d6e9e0d28176546cd6c
Commit Graph
1935 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zj 067558303a Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-16 09:49:41 +08:00
zj fef874c5ce 增加获取流程图片地址过滤 2021-12-16 09:48:16 +08:00
zj 4e32bb7ee5 Merge remote-tracking branch 'origin/FOTON' into FOTON 2021-12-16 09:09:04 +08:00
super_liu aec8010403 Merge remote-tracking branch 'origin/FOTON' into FOTON 2021-12-15 21:18:35 +08:00
super_liu f8309fdce0 feat: There is no way the 2021-12-15 21:17:53 +08:00
Superman_Main 9dc572e3d9 feat: There is no way the 2021-12-15 21:17:52 +08:00
Superman_Main 0877fb2df8 feat: There is no way the 2021-12-15 21:17:20 +08:00
Superman_Main 5ef31f9837 feat: There is no way the 2021-12-15 21:16:25 +08:00
2510220824 b030fb3e89 update:更新拆分图片存储位置 2021-12-15 21:16:24 +08:00
2510220824 7ee5bab2e4 update:新增拆分图片路径配置 2021-12-15 21:16:23 +08:00
2510220824 e605e9d93c update:修正线上ocr识别文件存储地址 2021-12-15 21:16:22 +08:00
super_liu f5b4ccc073 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!287
 2021-12-15 21:14:25 +08:00
super_liu bfc305b1bf Merge branch 'develop_master' into FOTON 2021-12-15 21:13:34 +08:00
zj 56ba29c455 Merge remote-tracking branch 'origin/develop_master' into FOTON 2021-12-15 19:55:32 +08:00
zj c73f9b50d4 修改文件上传默认路径 2021-12-15 19:54:18 +08:00
zhaokaiyao@91isoft.com 3bbbc90900 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-15 17:50:57 +08:00
zhaokaiyao@91isoft.com f00f5b9021 commit 2021-12-15 17:50:25 +08:00
王夏晖 c1ee44b19f Merge branch 'develop_master' into 'FOTON' 
拆分和ocr查询文件出错问题

See merge request LiuChao/foton-slrs-system-rest!286
 2021-12-15 16:17:53 +08:00
yuezhihang 14e2b3368c 拆分和ocr查询文件出错问题 2021-12-15 16:15:29 +08:00
zhaokaiyao@91isoft.com 0fafe93d39 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-15 15:17:35 +08:00
zhaokaiyao@91isoft.com 5b64f69989 资料中心接口 2021-12-15 15:17:18 +08:00
zhaokaiyao@91isoft.com 2762526260 水印透明度 在beginText方法后才能生效 2021-12-15 15:16:55 +08:00
super_liu 79e7719be4 feat: There is no way the 2021-12-15 14:26:03 +08:00
王夏晖 4fa4854e55 Merge branch 'develop_master' into 'FOTON' 
工作组

See merge request LiuChao/foton-slrs-system-rest!285
 2021-12-15 11:22:57 +08:00
yuezhihang 0a26dbfda9 工作组 2021-12-15 11:22:19 +08:00
王夏晖 19cfb7c27f Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!284
 2021-12-15 11:06:33 +08:00
yuezhihang 67deb52111 工作组下 关联属性删除1 2021-12-15 11:05:00 +08:00
zhaokaiyao@91isoft.com e35990d25f Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-15 10:41:51 +08:00
zhaokaiyao@91isoft.com bb5cd0a360 清单详情 因为实施日期报错 2021-12-15 10:41:31 +08:00
yuezhihang ebd5c94057 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-15 10:14:52 +08:00
yuezhihang 99f33ac218 工作组 单位不回显bug修复 2021-12-15 10:14:45 +08:00
王夏晖 2b7c98acee Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!283
 2021-12-15 09:16:47 +08:00
王夏晖 0964813f89 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!282
 2021-12-15 09:16:25 +08:00
super_liu 1062cd6c36 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!281
 2021-12-15 09:10:07 +08:00
super_liu e814c496d5 feat: There is no way the, 2021-12-15 09:09:22 +08:00
super_liu 121dc4b965 feat: There is no way the, 2021-12-15 09:08:41 +08:00
super_liu 417df71582 Merge branch 'develop_master' into FOTON 2021-12-14 21:56:59 +08:00
super_liu 1e83fad8bd feat: There is no way the 2021-12-14 21:56:42 +08:00
super_liu 3162479ce1 Merge branch 'develop_master' into FOTON 2021-12-14 21:48:43 +08:00
super_liu 6b8868a9b1 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss process

See merge request LiuChao/foton-slrs-system-rest!280
 2021-12-14 21:24:06 +08:00
super_liu 7521af3dd0 feat: There is no way the, buss process 2021-12-14 21:18:43 +08:00
zhaokaiyao@91isoft.com 246a9c01c9 下载带水印 2021-12-14 20:28:03 +08:00
zhaokaiyao@91isoft.com 02f0fb0cd7 体系结构缺少-内存中构造树结构时没有把改节点查出 2021-12-14 20:27:49 +08:00
yuezhihang cae1605ab1 工作组修改完已经可以回显 2021-12-14 17:45:23 +08:00
zhaokaiyao@91isoft.com 5eeb60b7f3 资料中心 2021-12-14 17:09:05 +08:00
yuezhihang a8fda1bb94 标准清单查询接口!!! 2021-12-14 16:33:07 +08:00
yuezhihang 0babd2b56f 统一修改了一下分页 2021-12-14 16:07:51 +08:00
zhaokaiyao@91isoft.com 36568f8c19 重点认证新增和删除逻辑完善 2021-12-14 13:55:31 +08:00
zhaokaiyao@91isoft.com 2412b50953 预警标表头和列宽 2021-12-14 10:32:25 +08:00
super_liu e90575d626 Merge branch 'develop_master' into FOTON 2021-12-13 20:19:50 +08:00