From 206b2a8034f066f7f4d08755abfee3f5049d0632 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 11:10:26 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
zq-erp/src/main/java/com/matrix/system/hive/action/ServiceRecordController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ServiceRecordController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ServiceRecordController.java
index 0e45975..0dd9357 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ServiceRecordController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ServiceRecordController.java
@@ -32,7 +32,7 @@
@RequestMapping(value = "/showAllList")
public @ResponseBody
- AjaxResult showAllList(ServiceRecord serviceRecord, PaginationVO pageVo) {
+ AjaxResult showAllList(ServiceRecord serviceRecord, PaginationVO pageVo) {
if (!getMe().getShopRole().equals(Dictionary.FLAG_YES_Y)) {
serviceRecord.setShopId(getMe().getShopId());
--
Gitblit v1.9.1