From a43e210f39562bbbdc25f75ec3aaad94ae33dfbf Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Thu, 15 Jul 2021 18:04:16 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java index e790d7c..bb52ad3 100644 --- a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java +++ b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java @@ -258,7 +258,6 @@ - @Autowired /** -- Gitblit v1.9.1