Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-17 b461c97608c8b03c1c0459805e441669c8455e42

 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html

@@ -574,11 +574,11 @@
                }
            },
            changePageSize(val) {
                this.table.pageSize = val;
                this.fxyList.pageSize = val;
                this.loadParamSetting();
            },
            changeCurrentPage(val) {
                this.table.currentPage = val;
                this.fxyList.currentPage = val;
                this.loadParamSetting();
            },
            //时间格式化