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

无关风月

13 小时以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html

@@ -40,5 +40,8 @@
<script>
</script>
<script type="application/javascript">
    var welfarePicture = new $WebUpload("welfarePicture");
    welfarePicture.setUploadBarId("progressBar");
    welfarePicture.init();
</script>
@}