Authored by mali

Merge branch 'master' into pre_master

@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 </div> 99 </div>
100 <div class="col-sm-8"> 100 <div class="col-sm-8">
101 <input type="file" id="shopLogo" name="shopLogo" value="<%data.shopLogo%>" size="500"> 101 <input type="file" id="shopLogo" name="shopLogo" value="<%data.shopLogo%>" size="500">
102 - <p><span class="red" style="position: absolute; bottom: 0">提示: 请上传像素为150*150的图片,大小小于500KB</span></p> 102 + <p><span class="red" style="position: absolute; bottom: 0">提示: 请上传像素为320*160的图片,大小小于500KB</span></p>
103 </div> 103 </div>
104 </div> 104 </div>
105 <div class="form-group"> 105 <div class="form-group">