FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,899 Commits 1 Branch 0 Tags
5206fe004b46d07ebd3c77d5afa80916618cf11a
Commit Graph
46 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
2510220824 a89e642f00 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-26 23:05:06 +08:00
2510220824 cde2bb97e8 update:修正合并条款造成解读时条款不显示的问题 2022-01-26 19:19:36 +08:00
2510220824 c97e8442f4 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-21 08:13:03 +08:00
2510220824 c239ad7c99 update:无岗位用户无法访问系统 2022-01-21 08:12:15 +08:00
2510220824 d64c22a4f8 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-29 21:40:40 +08:00
2510220824 d7cd2d9fae update:pcms车型项目接收到的数据新增3个字段 2021-12-29 21:39:07 +08:00
2510220824 f068dacc7f update:pcms车型项目接收到的数据新增3个字段 2021-12-29 17:36:07 +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
2510220824 94497e6d5e Merge remote-tracking branch 'origin/FOTON' into FOTON_RELEASE 2021-11-29 22:35:01 +08:00
2510220824 5c358d5570 update:ocr回调文件存储 2021-11-29 22:34:31 +08:00
2510220824 fa76e1eb6c update:更新拆分图片存储位置 2021-11-19 15:14:23 +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 4894c59ebd Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-19 11:20:50 +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
2510220824 900bcb9c14 add:福田生产环境配置 2021-10-20 14:36:20 +08:00
2510220824 dba3ce87af Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-19 16:18:34 +08:00
2510220824 59c8f0f60b add:优化机构管理人员查询，不传机构就查全部 2021-10-19 16:18:11 +08:00
2510220824 a68d9c9e9d add：修改pcms数据下发接口，统一访问前缀 2021-10-16 09:46:26 +08:00
2510220824 89116af8bf Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-16 09:34:08 +08:00
2510220824 8b479fca0c add:修改用户获取权限，修改pcms数据同步 2021-10-16 09:33:48 +08:00
2510220824 b47e30c9ee Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
 2021-10-13 15:36:54 +08:00
2510220824 3fcd7e90f6 add:增加数据下发白名单 2021-10-13 15:35:05 +08:00
2510220824 8e8bb38d07 add:增加IDM单点登录及修改服务认证 2021-09-28 18:13:27 +08:00
2510220824 81799abfb1 add:修改ocr回调文件存储 2021-08-25 09:22:45 +08:00
2510220824 97cec30f4d Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-24 14:24:40 +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
2510220824 b5102e1783 add:更改restTemplate 2021-08-19 16:32:45 +08:00
2510220824 43a72ca794 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-18 09:36:48 +08:00
2510220824 a45045f61c add:重置mq配置 2021-08-18 09:35:41 +08:00
2510220824 67adf4145a Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-17 16:16:33 +08:00
2510220824 7b28ebb23c add:ocr配置 2021-08-17 16:15:51 +08:00
2510220824 17a82cf235 add:恢复es配置 2021-08-16 10:18:15 +08:00
2510220824 13d51ae2a1 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-11 13:34:29 +08:00
2510220824 b14a80c7a4 add:新增同步车型项目，组织数据接口 2021-08-11 13:33:42 +08:00
2510220824 4302fed66f Merge remote-tracking branch 'origin/develop_3' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-08-09 17:10:30 +08:00
2510220824 935a47d1f1 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-28 15:36:42 +08:00
2510220824 de8f5631c0 add:升级es到7.6.2 2021-07-28 15:35:45 +08:00
2510220824 a6442d5b8d Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-04 13:58:21 +08:00
2510220824 3e69a462b0 add:IDM组织、人员数据同步 2021-07-04 13:57:56 +08:00
2510220824 51d3edebfd add:集成es搜索模块 2021-06-22 17:14:39 +08:00