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

无关风月

昨天 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

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

@@ -24,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>