Merge branch 'master' of https://bdgit.educoder.net/puf7keiya/aaaa into zyl_branch
# Conflicts:
# src/client/OCR_baidu.jar
# src/client/OCR_baidu/.idea/.gitignore
# src/client/OCR_baidu/.idea/artifacts/OCR_baidu_jar.xml
# src/client/OCR_baidu/.idea/compiler.xml
# src/client/OCR_baidu/.idea/libraries/aip_java_sdk_4_16_11.xml
# src/client/OCR_baidu/.idea/libraries/json_20160810.xml
# src/client/OCR_baidu/.idea/libraries/slf4j_api_1_7_25.xml
# src/client/OCR_baidu/.idea/libraries/slf4j_simple_1_7_25.xml
# src/client/OCR_baidu/.idea/misc.xml
# src/client/OCR_baidu/.idea/modules.xml
# src/client/OCR_baidu/.idea/uiDesigner.xml
# src/client/OCR_baidu/META-INF/MANIFEST.MF
# src/client/OCR_baidu/OCR_baidu.iml
# src/client/OCR_baidu/lib/aip-java-sdk-4.16.11.jar
# src/client/OCR_baidu/lib/json-20160810.jar
# src/client/OCR_baidu/lib/slf4j-api-1.7.25.jar
# src/client/OCR_baidu/lib/slf4j-simple-1.7.25.jar
# src/client/OCR_baidu/out/META-INF/MANIFEST.MF
# src/client/OCR_baidu/out/production/OCR_baidu/AipOcr.class
# src/client/OCR_baidu/out/production/OCR_baidu/CovidTestRep.class
# src/client/OCR_baidu/out/production/OCR_baidu/HealthCode.class
# src/client/OCR_baidu/out/production/OCR_baidu/META-INF/MANIFEST.MF
# src/client/OCR_baidu/out/production/OCR_baidu/TripCode.class
# src/client/OCR_baidu/src/AipOcr.java
# src/client/OCR_baidu/src/CovidTestRep.java
# src/client/OCR_baidu/src/HealthCode.java
# src/client/OCR_baidu/src/META-INF/MANIFEST.MF
# src/client/OCR_baidu/src/TripCode.java
|
233
吕一航