 396572590@qq.com
|
3213e37979
|
Merge branch 'develop_master' into FOTON
|
2022-06-27 17:21:01 +08:00 |
|
|
zhangyanduan
|
7584a3cc51
|
fix: 修复当登录的TOKEN认证失败后，抛出的异常中无法被识别到导致前端无法捕获此类异常数据导致无法正确返回页面
|
2022-06-27 14:57:07 +08:00 |
|
|
super_liu
|
623558c19a
|
Merge branch 'develop_master' into FOTON
|
2022-06-06 11:42:54 +08:00 |
|
|
zhangyanduan
|
692907904d
|
mybatisPlus 增加乐观锁机制
|
2022-06-02 14:10:01 +08:00 |
|
|
super_liu
|
113f12083e
|
Merge branch 'develop_master' into FOTON
|
2022-05-26 09:20:23 +08:00 |
|
|
qk
|
646affd788
|
update:修改bug
|
2022-05-26 08:55:59 +08:00 |
|
|
super_liu
|
8c06f08b90
|
Merge branch 'develop_master' into FOTON
|
2022-05-18 11:40:27 +08:00 |
|
|
super_liu
|
f91f97847a
|
feat: There is no way the,rar、zip、dot
|
2022-05-18 11:40:03 +08:00 |
|
|
wangxiahui@91isoft.com
|
d4a936a750
|
update:修改ocr回调地址中的域名错误
|
2022-05-09 15:19:35 +08:00 |
|
|
super_liu
|
1ca5e62893
|
Merge branch 'develop_master' into FOTON
|
2022-04-30 10:44:31 +08:00 |
|
|
super_liu
|
2d0cbedf0d
|
feat: There is no way the,
|
2022-04-30 10:43:13 +08:00 |
|
|
super_liu
|
6bf0e1260d
|
feat: There is no way the,
|
2022-04-29 23:18:02 +08:00 |
|
|
super_liu
|
d5283d582d
|
feat: There is no way the,
|
2022-04-29 18:15:00 +08:00 |
|
|
super_liu
|
40eb85a464
|
feat: There is no way the,
|
2022-04-29 18:14:12 +08:00 |
|
|
super_liu
|
178c30336e
|
feat: There is no way the, rest es conf
|
2022-04-08 15:26:37 +08:00 |
|
|
super_liu
|
8e7c6b19d3
|
feat: There is no way the, rest es conf
|
2022-04-08 11:48:46 +08:00 |
|
|
super_liu
|
7e41d25944
|
feat: There is no way the, 配置文件 添加 pdg 文件类型
|
2022-03-22 16:57:59 +08:00 |
|
|
yuezhihang
|
5206fe004b
|
接口上加注解EpcLog 并加备注 可存储操作日志
|
2022-02-16 16:07:40 +08:00 |
|
|
super_liu
|
79e7719be4
|
feat: There is no way the
|
2021-12-15 14:26:03 +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 |
|
|
zhaokaiyao@91isoft.com
|
5eeb60b7f3
|
资料中心
|
2021-12-14 17:09:05 +08:00 |
|
|
Superman_Main
|
bdf1692e62
|
feat: There is no way the
|
2021-12-08 21:26:20 +08:00 |
|
|
Superman_Main
|
6cf002a489
|
Merge branch 'develop_master' into FOTON
# Conflicts:
# adc-da-main/src/main/resources/application.properties
|
2021-11-27 19:55:06 +08:00 |
|
|
Superman_Main
|
5c4f8108d7
|
feat: There is no way the,
|
2021-11-27 19:50:56 +08:00 |
|
|
Superman_Main
|
ed128e1403
|
feat: There is no way the
|
2021-11-20 16:46:00 +08:00 |
|
|
Superman_Main
|
09ebe8f394
|
feat: There is no way the
|
2021-11-20 11:31:26 +08:00 |
|
|
2510220824
|
6ba96a22ea
|
update:新增拆分图片路径配置
|
2021-11-19 11:25:57 +08:00 |
|
|
2510220824
|
da69053af6
|
Merge remote-tracking branch 'origin/develop_master' into FOTON_RELEASE
# Conflicts:
# adc-da-main/src/main/resources/application-dev.properties
|
2021-11-19 11:24:00 +08:00 |
|
|
2510220824
|
9dc1eca724
|
update:文档拆分图片存储路径入配置文件
|
2021-11-19 11:19:11 +08:00 |
|
|
2510220824
|
3b03f7a7ea
|
update:修正线上ocr识别文件存储地址
|
2021-11-18 17:27:08 +08:00 |
|
|
yuezhihang
|
2dcb38a066
|
数据库时间差问题修改
|
2021-11-10 13:52:36 +08:00 |
|
|
yuezhihang
|
a675e374bc
|
清单 流程回退
|
2021-10-27 09:38:56 +08:00 |
|
|
super_liu
|
c604ad2461
|
feat: There is no way the
|
2021-10-22 16:04:25 +08:00 |
|
|
2510220824
|
900bcb9c14
|
add:福田生产环境配置
|
2021-10-20 14:36:20 +08:00 |
|
|
super_liu
|
8317333e96
|
feat: There is no way the
|
2021-10-18 10:37:44 +08:00 |
|
|
super_liu
|
3c3a199a1a
|
feat: There is no way the idm and oa
|
2021-10-11 17:45:30 +08:00 |
|
|
super_liu
|
2ec4db856a
|
Merge remote-tracking branch 'origin/develop_master_bak' into dev_wxh_bak
|
2021-10-09 14:27:14 +08:00 |
|
|
super_liu
|
d7cd16a69c
|
feat: There is no way the
|
2021-09-30 15:36:39 +08:00 |
|
|
2510220824
|
8e8bb38d07
|
add:增加IDM单点登录及修改服务认证
|
2021-09-28 18:13:27 +08:00 |
|
|
super_liu
|
2ec116944c
|
feat: There is no way the ocr handle url
|
2021-09-01 17:01:19 +08:00 |
|
|
super_liu
|
ea473ee500
|
feat: There is no way the ocr
|
2021-08-31 18:02:50 +08:00 |
|
|
2510220824
|
81799abfb1
|
add:修改ocr回调文件存储
|
2021-08-25 09:22:45 +08:00 |
|
|
super_liu
|
a242b9ac56
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the Buss and Convert
See merge request !120
|
2021-08-20 10:12:39 +00:00 |
|
|
super_liu
|
fe89ba9c60
|
feat: There is no way the Buss and Convert
|
2021-08-20 18:12:08 +08:00 |
|
|
super_liu
|
aaa9598735
|
feat: There is no way the !!!
|
2021-08-20 15:05:24 +08:00 |
|
|
super_liu
|
38690f92b6
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-20 12:01:15 +08:00 |
|
|
super_liu
|
4abeb55cf3
|
feat: There is no way the scheduled conf
|
2021-08-20 12:00:56 +08:00 |
|
|
2510220824
|
b5102e1783
|
add:更改restTemplate
|
2021-08-19 16:32:45 +08:00 |
|
|
super_liu
|
7c7be1065c
|
feat: There is no way the WebMvcConfigurer
|
2021-08-19 11:35:10 +08:00 |
|
|
yuezhihang
|
508c292200
|
配置文件
|
2021-08-18 15:15:06 +08:00 |
|