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

无关风月

20 小时以前 1293009364a938f32b8b9066caafa2f55be06496

 cloud-server-management/src/main/webapp/WEB-INF/view/common/tags/avatar.tag

@@ -20,7 +20,7 @@
            <i class="fa fa-upload"></i>&nbsp;文件上传
        </div>
    </div>
    <input type="hidden" id="${id}" />
    <input type="hidden" id="${id}" value="${avatarImg}"/>
</div>
@if(isNotEmpty(underline) && underline == 'true'){
    <div class="hr-line-dashed"></div>