Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-15 269985404f94b50d14099b83f3436d6d405c365d

 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html

@@ -625,7 +625,7 @@
                        //获取用户列表
                        AjaxProxy.requst({
                            app: _this,
                            url: basePath + '/admin/shopAll',
                            url: basePath + '/admin/all',
                            callback: function (data) {
                                _this.userList = data.rows;
                            }