 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 |
|