Merge remote-tracking branch 'origin/develop_master' into develop_1

This commit is contained in:
yanyizhou
2021-08-25 13:36:06 +08:00
@@ -57,7 +57,6 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
@Value("${OCR.convertType}") @Value("${OCR.convertType}")
private String convertType; private String convertType;
@Autowired @Autowired
@Qualifier(value = "remoteRestTemplate")
private RestTemplate restTemplate; private RestTemplate restTemplate;
@Autowired @Autowired
private OkHttpUtil okHttpUtil; private OkHttpUtil okHttpUtil;