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

无关风月

15 小时以前 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

 cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser.html

@@ -9,7 +9,6 @@
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">

                            <div class="col-sm-3">
                                <#NameCon id="name" name="管理员姓名：" />
                            </div>
@@ -25,7 +24,7 @@
                                    </div>
                                    <select style="width: 300px" class="form-control" id="platform" name = "platform">
                                        <option value="">全部</option>
                                        <option value="1">微信</option>

                                        <option value="2">支付宝</option>
                                    </select>
                                </div>
@@ -44,7 +43,6 @@
                                    </select>
                                </div>
                            </div>

                            <div class="col-sm-3">
                                <div class="input-group">
                                    <div class="input-group-btn open">
@@ -58,7 +56,6 @@
                                        <option value="1">审核中</option>
                                        <option value="2">审核通过</option>
                                        <option value="3">审核失败</option>

                                    </select>
                                </div>
                            </div>