Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

15 小时以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js

@@ -651,9 +651,9 @@
    var carPhoto = new $WebUpload("img");
    carPhoto.setUploadBarId("progressBar");
    carPhoto.init();
    var carPhoto = new $WebUpload("welfarePicture");
    carPhoto.setUploadBarId("progressBar");
    carPhoto.init();
    var welfarePicture = new $WebUpload("welfarePicture");
    welfarePicture.setUploadBarId("progressBar");
    welfarePicture.init();
    var drivingLicensePhoto = new $WebUpload("drivingLicensePhoto");
    drivingLicensePhoto.setUploadBarId("progressBar");
    drivingLicensePhoto.init();