From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjTypeController.java | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjTypeController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjTypeController.java
index 20b81ff..15abb61 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjTypeController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjTypeController.java
@@ -25,13 +25,8 @@
@RequestMapping(value = "/admin/projtype")
public class ProjTypeController extends BaseController {
-
@Resource
private SysProjTypeService currentService;
-
-
-
-
public static final String fnCode = "projType";
public static final String search = fnCode + ":search";
--
Gitblit v1.9.1