 233
|
90be77bb76
|
Merge branch 'master' of https://bdgit.educoder.net/puf7keiya/aaaa into 冯健铠
# Conflicts:
# README.md
|
2 years ago |
|
puf7keiya
|
bd9c26a4c6
|
Merge pull request 'zyl_branch' (#14) from zyl_branch into master
|
2 years ago |
|
233
|
f0c39fdf89
|
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
|
2 years ago |
|
puf7keiya
|
39339539f9
|
Merge pull request 'fzh_branch' (#13) from fuzh_branch into master
|
2 years ago |
|
233
|
d13c4d1309
|
Merge branch 'master' of https://bdgit.educoder.net/puf7keiya/aaaa into fuzh_branch
|
2 years ago |
|
puf7keiya
|
fdb98d20de
|
Merge pull request 'bxj_branch' (#12) from bxj into master
|
2 years ago |
|
233
|
d2b0239a5d
|
Merge branch 'master' of https://bdgit.educoder.net/puf7keiya/aaaa into bxj
|
2 years ago |
|
puf7keiya
|
57c8bd1bf6
|
Merge pull request 'lyh_branch' (#11) from LvYH_branch into master
|
2 years ago |
|
233
|
5b42f80a80
|
Merge branch 'master' of https://bdgit.educoder.net/puf7keiya/aaaa into LvYH_branch
|
2 years ago |
|
puf7keiya
|
e943a123a8
|
Merge pull request 'cay_branch' (#10) from CAY into master
|
2 years ago |
吕一航
|
1edcf80796
|
1
|
2 years ago |
|
吕一航
|
2918f956c8
|
1
|
2 years ago |
|
吕一航
|
04e0539e52
|
1
|
2 years ago |
|
吕一航
|
13ce949dd9
|
1
|
2 years ago |
|
吕一航
|
49ab16d4b0
|
1
|
2 years ago |
|
吕一航
|
eb6d7106e3
|
1
|
2 years ago |
|
吕一航
|
abef85bf7f
|
Merge branch 'LvYH_branch' of https://bdgit.educoder.net/puf7keiya/aaaa into LvYH_branch
|
2 years ago |
|
吕一航
|
101606c56c
|
1
|
2 years ago |
|
吕一航
|
5662820a90
|
1
|
2 years ago |
|
吕一航
|
cdb6452dc5
|
1
|
2 years ago |
|
吕一航
|
cb5c402d04
|
11
|
2 years ago |
|
吕一航
|
4b4615f806
|
11
|
2 years ago |
|
吕一航
|
f6c7c9bd7a
|
1
|
2 years ago |
|
吕一航
|
14d9809bdd
|
Merge branch '冯健铠' of https://bdgit.educoder.net/puf7keiya/aaaa into 冯健铠
|
2 years ago |
|
吕一航
|
4fc440c406
|
11
|
2 years ago |
|
吕一航
|
16251d7774
|
11
|
2 years ago |
|
puf7keiya
|
160856ad02
|
Merge pull request 'cay' (#9) from CAY into master
|
2 years ago |
|
吕一航
|
e70dd5f95a
|
1
|
2 years ago |
|
吕一航
|
8094d2f6e7
|
11
|
2 years ago |
|
puf7keiya
|
b4f989bc2f
|
Merge pull request 'cay_model' (#7) from CAY into master
|
2 years ago |
|
233
|
40dc7aa43c
|
11
|
2 years ago |
|
233
|
724a02d991
|
Merge branch 'master' of https://bdgit.educoder.net/puf7keiya/aaaa into CAY
|
2 years ago |
|
puf7keiya
|
caf908a29e
|
Merge pull request 'fjk_model' (#6) from 冯健铠 into master
|
2 years ago |
|
puf7keiya
|
7840b47332
|
Merge pull request 'fzh_model' (#4) from fuzh_branch into master
|
2 years ago |
|
puf7keiya
|
56c3ea0141
|
Merge pull request 'zyl_model' (#5) from zyl_branch into master
|
2 years ago |
|
puf7keiya
|
7742106558
|
Merge pull request 'bxj_model' (#3) from bxj into master
|
2 years ago |
|
puf7keiya
|
1634a1c89e
|
Merge pull request 'lyhmodel' (#2) from LvYH_branch into master
|
2 years ago |
|
233
|
213f7d660a
|
Merge branch 'master' of https://bdgit.educoder.net/puf7keiya/aaaa into LvYH_branch
|
2 years ago |
|
233
|
565d2e903a
|
Merge branch '冯健铠' of https://bdgit.educoder.net/puf7keiya/aaaa into 冯健铠
|
2 years ago |
|
233
|
71c275b7ff
|
Merge branch 'master' of https://bdgit.educoder.net/puf7keiya/aaaa into 冯健铠
|
2 years ago |
|
吕一航
|
2e4f147eff
|
1
|
2 years ago |
|
吕一航
|
dc0913b69d
|
Merge remote-tracking branch 'remotes/origin/master'
|
2 years ago |
|
吕一航
|
b78084225f
|
Merge branch 'CAY' of https://bdgit.educoder.net/puf7keiya/aaaa
|
2 years ago |
|
吕一航
|
b66a8df698
|
Merge branch 'master' of https://bdgit.educoder.net/puf7keiya/aaaa into CAY
|
2 years ago |
|
吕一航
|
44dc1fb4ba
|
model
|
2 years ago |
|
吕一航
|
c4c1a2465d
|
model
|
2 years ago |
|
吕一航
|
b38e6b8ef6
|
model
|
2 years ago |
|
吕一航
|
44ff9a3ef4
|
model
|
2 years ago |
|
吕一航
|
efdfe7bdcd
|
model
|
2 years ago |
|
吕一航
|
a0825500c9
|
model
|
2 years ago |
