FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,245 Commits 1 Branch 0 Tags
3ff13e47715bdf6fda00231b4e60167367cabfbd
Commit Graph
163 Commits
Author SHA1 Message Date
gaojiabao 4a6794ec9f 配置文件修改 数据库 GTM+8问题 时间为中国时区 2023-05-16 17:37:05 +08:00
SUNJIABIN 1dc522a461 Revert "增加拆分导入白名单" 
This reverts commit 5263b6fd6b.
 2023-04-06 09:49:56 +08:00
SUNJIABIN 5263b6fd6b 增加拆分导入白名单 2023-04-06 09:38:10 +08:00
gaojiabao faa7fdd02e Merge branch 'dev_20230216' of E:\futianxiangmu\foton-slrs-system-rest with conflicts. 2023-03-02 17:21:02 +08:00
高嵩 d5e45e8ef4 修改elasticsearch.img配置 2023-02-15 10:45:14 +08:00
高嵩 9186b38f82 合并分支 'fix_foton' 到 'master' 
Fix foton

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!21
 2023-02-15 10:31:39 +08:00
高嵩 862960b3bf Merge remote-tracking branch 'origin/dev_foton_GJB' 
# Conflicts:
#	adc-da-main/src/main/resources/application.properties
 2023-02-13 09:25:44 +08:00
CD a7df5f7eac 恢复 2023-01-13 15:32:25 +08:00
CD 4457faae39 跨域修改尝试 2023-01-13 15:26:51 +08:00
gaojiabao 422de0ec29 拆分流程图片展示以及导出出片超链接格式 2022-12-28 10:42:03 +08:00
高嵩 bba67a11dc 回复线上pom.xml的net.sf.dozer配置 2022-12-07 17:05:42 +08:00
liyawei a90d57b4c5 生产环境配置文件恢复 2022-12-07 16:46:13 +08:00
李雅玮 23d50e06d1 Merge branch 'FOTON' into 'develop_master' 
# Conflicts:
#   adc-da-main/src/main/resources/application.properties
 2022-12-07 16:38:07 +08:00
cuijiaming 6175ea6b9f 征求意见-查询出来的数据跟数据的查询条件不符合（已解决） 2022-12-01 11:47:37 +08:00
liyawei 1372f306ea 生产环境配置文件恢复 2022-11-24 17:42:22 +08:00
liyawei 044468b7f5 Merge remote-tracking branch 'origin/develop_master' into FOTON 
# Conflicts:
#	adc-da-main/src/main/resources/application-dev.properties
 2022-11-24 17:30:46 +08:00
liyawei 50ded28c72 开发环境配置文件更新 2022-11-24 14:48:32 +08:00
zyd f96370df40 Merge branch 'develop_master' into FOTON 2022-10-12 23:10:47 +08:00
zyd 3c89f8bdbd add: 更新swagger接口配置参数 2022-10-12 23:10:35 +08:00
zyd 001a9287cf fix: 将线上版本的日志输出路径配置为当前jar包所在的路径 2022-08-31 01:27:09 +08:00
396572590@qq.com 9531c2643d feat: There is no way the, /data/slrs/system-server/logs 2022-08-01 15:28:41 +08:00
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