Merge remote-tracking branch 'origin/dev' into test

This commit is contained in:
fan 2019-11-08 20:31:10 +08:00
commit 30f1997a08

View File

@ -6,7 +6,7 @@
<div class="notes">{{ room.permissionRest }} / {{ room.permissionNum - 1 }}</div> <div class="notes">{{ room.permissionRest }} / {{ room.permissionNum - 1 }}</div>
</div> </div>
<div class="roles__head--reset"> <div class="roles__head--reset">
<el-button size="mini" round>重置</el-button> <!--<el-button size="mini" round>重置</el-button>-->
</div> </div>
</div> </div>
<div class="roles__container"> <div class="roles__container">