GitBucket
|
Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/dictionaries/ubt.xml # .idea/encodings.xml # .idea/inspectionProfiles/Project_Default.xml # .idea/inspectionProfiles/profiles_settings.xml # .idea/misc.xml # .idea/modules.xml # .idea/py1.iml # .idea/vcs.xml # shizhan/jingdong/file/360.csv # shizhan/jingdong/file/APPLE.csv # shizhan/jingdong/file/COOLPAD.csv # shizhan/jingdong/file/DAXIAN.csv # shizhan/jingdong/file/GIONEE.csv # shizhan/jingdong/file/HAIER.csv # shizhan/jingdong/file/HISENSE.csv # shizhan/jingdong/file/HTC.csv # shizhan/jingdong/file/HUAWEI.csv # shizhan/jingdong/file/KONKA.csv # shizhan/jingdong/file/LENOVO.csv # shizhan/jingdong/file/LETV.csv # shizhan/jingdong/file/LG.csv # shizhan/jingdong/file/MEIZU.csv # shizhan/jingdong/file/MI.csv # shizhan/jingdong/file/MOTOROLA.csv # shizhan/jingdong/file/NUBIA.csv # shizhan/jingdong/file/OPPO.csv # shizhan/jingdong/file/PHILIPS.csv # shizhan/jingdong/file/SAMSUNG.csv # shizhan/jingdong/file/SONY.csv # shizhan/jingdong/file/TCL.csv # shizhan/jingdong/file/UNISCOPE.csv # shizhan/jingdong/file/VIVO.csv # shizhan/jingdong/file/ZTE.csv # shizhan/jingdong/jd_build_csv.py |
|---|
|
|
| .idea/dictionaries/ubt.xml |
|---|
|
Too large
|
| .idea/vcs.xml |
|---|
|
Too large
|
| py1.zip 0 → 100755 |
|---|
|
Too large
|
| shizhan/HttpMethod/form.txt 0 → 100644 |
|---|
|
Too large
|
| shizhan/HttpMethod/header.txt 0 → 100644 |
|---|
|
Too large
|
| shizhan/HttpMethod/http.py 0 → 100644 |
|---|
|
Too large
|
| shizhan/HttpMethod/start.py 0 → 100644 |
|---|
|
Too large
|
| shizhan/HttpMethod/tools.py 0 → 100755 |
|---|
|
Too large
|
| shizhan/dongliu/list.py 0 → 100644 |
|---|
|
Too large
|
| shizhan/dongliu/tools.py 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/21KE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/360.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/8848.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/AGM.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/AOLE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/APPLE.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/ASUS.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/BENQ.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/BEST.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/BIFER.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/BIHEE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/BIRD.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/BLACKBERRY.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/BROR.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/CAPITEL.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/CHANGHONG.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/CHINO.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/CONG.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/COOBE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/COOLPAD.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/COOLPAD222222222222222222.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/COTTEE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/DAXIAN.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/DB.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/DOOV.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/EBEST.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/EPHONE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/F.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/FORME.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/G.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/GANEN.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/GERMY.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/GIGASET.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/GIONEE.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/GOISUN.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/GOOGLE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/GREENORANGE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/GRSED.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/HAIER.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/HANMAC.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/HASEE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/HEEYU.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/HISENSE.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/HONFONE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/HTC.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/HTFPOS.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/HUADOO.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/HUAWEI.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/INFOCUS.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/INNOS.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/INTKI.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/IVVI.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/JEASUNG.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/JKL.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/K.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/KDOOR.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/KONKA.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/KOOBEE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/KOPO.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/LENOVO.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/LEPHONE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/LETV.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/LEWAY.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/LEWEI.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/LG.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/LINGWIN.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/LOVME.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/MALATA.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/MANN.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/MEITU.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/MEIWINGS.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/MEIZU.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/MI.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/MICROSOFT.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/MLLED.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/MOBA.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/MOTOROLA.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/NEWMAN.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/NFOX.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/NOAIN.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/NOKIA.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/NOSSON.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/NUBIA.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/NUOFEI.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/OPPO.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/OUKI.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/PHILIPS.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/RUGGEAR.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/SAGA.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/SAMSUNG.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/SAMWEI.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/SANCUP.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/SHARP.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/SMARTISAN.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/SOAIY.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/SONIM.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/SONY.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/SOP.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/SOYES.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/SUGAR.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/TANGWEI.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/TCL.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/TEMSENT.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/TETC.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/UIMI.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/UNISCOPE.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/UOOGOU.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/V.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/VIVO.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/VK.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/WANYOU.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/WELL.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/XTYOU.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/YEPEN.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/YLT.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/YOORD.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/YOTAPHONE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/ZTE.csv |
|---|
|
Too large
|
| shizhan/jingdong/file/一加.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/世纪天元.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/东信欧蓓.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/中国联通.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/乐目.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/优护.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/关爱心.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/博阅.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/威铂.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/小辣椒.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/广信.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/易百年.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/朗格.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/欧沃.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/爱贝多.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/纽曼.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/维西特.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/职业者.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/观.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/途耐.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/锐力通.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/锐族.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/file/魅兴.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/.~lock.MI.csv# 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/360.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/APPLE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/COOLPAD.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/DAXIAN.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/GIONEE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/HAIER.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/HISENSE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/HTC.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/HUAWEI.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/K-Touch.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/KONKA.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/LENOVO.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/LETV.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/LG.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/MEIZU.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/MI.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/MOTOROLA.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/NUBIA.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/OPPO.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/PHILIPS.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/SAMSUNG.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/SONY.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/TCL.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/UNISCOPE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/VIVO.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/XIAOLAJIAO.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/filea/ZTE.csv 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/htmla/data.js 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/htmla/echarts.min.js 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/htmla/index.html 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/htmla/jquery.min.js 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/htmla/py.html 0 → 100755 |
|---|
|
Too large
|
| shizhan/jingdong/jd_build_csv.py |
|---|
|
Too large
|
| shizhan/md5/md5.sh 0 → 100755 |
|---|
|
Too large
|
| shizhan/py_joke.zip 0 → 100644 |
|---|
|
Too large
|
| shizhan/stock/stock.desktop 0 → 100755 |
|---|
|
Too large
|
| shizhan/stock/stock.sh 0 → 100755 |
|---|
|
Too large
|