Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-06 e1c8bed1b24df8a6c80ffa582bb966acacc8a5d7

 Api/src/main/java/com/java110/api/rest/GetPhotoByInst.java

@@ -65,6 +65,7 @@
        String photoUrl = tmpPhotoPaths[1];

        downloadFromUrl(photoUrl,DEFAULTE_PHOTO_DIR,"qhdx_"+instId+"_17.jpg");
        //downloadFromUrl(photoUrl,DEFAULTE_PHOTO_DIR,instId+".jpg");
    }