From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java b/java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java
index e6c3ba4..b79f46a 100644
--- a/java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java
+++ b/java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java
@@ -141,6 +141,22 @@
/**
+ * 淇濆瓨涓氫富杞﹁締
+ */
+ public static final String BUSINESS_TYPE_SAVE_OWNER_CAR_ATTR = "111200030002";
+
+ /**
+ * 淇敼涓氫富杞﹁締
+ */
+ public static final String BUSINESS_TYPE_UPDATE_OWNER_CAR_ATTR = "111200040002";
+
+
+ /**
+ * 鍒犻櫎涓氫富杞﹁締
+ */
+ public static final String BUSINESS_TYPE_DELETE_OWNER_CAR_ATTR = "111200050002";
+
+ /**
* 淇濆瓨杞﹁締榛戠櫧鍚嶅崟
*/
public static final String BUSINESS_TYPE_SAVE_CAR_BLACK_WHITE = "112200030001";
@@ -467,6 +483,22 @@
* 鍒犻櫎杞︿綅
*/
public static final String BUSINESS_TYPE_DELETE_PARKING_SPACE = "540100050001";
+
+ /**
+ * 澧炲姞杞︿綅
+ */
+ public static final String BUSINESS_TYPE_SAVE_PARKING_SPACE_ATTR = "540100030002";
+
+ /**
+ * 淇敼杞︿綅
+ */
+ public static final String BUSINESS_TYPE_UPDATE_PARKING_SPACE_ATTR = "540100040002";
+
+
+ /**
+ * 鍒犻櫎杞︿綅
+ */
+ public static final String BUSINESS_TYPE_DELETE_PARKING_SPACE_ATTR = "540100050002";
/**
* 娣诲姞杩涘満璁板綍
@@ -1215,6 +1247,25 @@
public static final String BUSINESS_TYPE_DELETE_LOCATION="570100050001";
/**
+ * 淇濆瓨浠诲姟
+ * 3淇濆瓨
+ */
+ public static final String BUSINESS_TYPE_SAVE_LOCATION_ATTR="570100030002";
+
+
+ /**
+ * 淇敼浠诲姟
+ * 3淇濆瓨
+ */
+ public static final String BUSINESS_TYPE_UPDATE_LOCATION_ATTR="570100040002";
+
+ /**
+ * 鍒犻櫎浠诲姟
+ */
+ public static final String BUSINESS_TYPE_DELETE_LOCATION_ATTR="570100050002";
+
+
+ /**
* 淇濆瓨宸ヤ綔娴�
* 3淇濆瓨
*/
@@ -1376,6 +1427,9 @@
*/
public static final String BUSINESS_TYPE_DELETE_MACHINE_AUTH="661100050004";
-
+ /**
+ * 寮�闂ㄨ褰� 閫乨atabus
+ */
+ public static final String BUSINESS_TYPE_DATABUS_SEND_OPEN_LOG = "990000060001";
}
--
Gitblit v1.8.0