Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

bingbing

2020-07-23 e6a149ea753350d3bebbd76ce40315a8b6016b4e

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html

@@ -1,6 +1,7 @@
<!-- user表单弹窗 -->
<form id="user-form" lay-filter="user-form" class="layui-form model-form">
    <input name="id" type="hidden"/>
    <input name="type" type="hidden" value="BACKEND"/>
    <div class="layui-form-item">
        <label class="layui-form-label">账号</label>
        <div class="layui-input-block">
@@ -53,7 +54,7 @@

        // 获取所有角色
        layer.load(2);
        admin.req('api-user/allRoles', {}, function (data) {
        admin.req('api-user/findByMap', {}, function (data) {
            layer.closeAll('loading');
            if (0 == data.code) {
                // 渲染多选下拉框