From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
service-common/src/main/java/com/java110/common/bmo/machine/IMachineOpenDoorBMO.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/machine/IMachineOpenDoorBMO.java b/service-common/src/main/java/com/java110/common/bmo/machine/IMachineOpenDoorBMO.java
index d4981cd..fdc9814 100644
--- a/service-common/src/main/java/com/java110/common/bmo/machine/IMachineOpenDoorBMO.java
+++ b/service-common/src/main/java/com/java110/common/bmo/machine/IMachineOpenDoorBMO.java
@@ -16,7 +16,6 @@
package com.java110.common.bmo.machine;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.attrValue.AttrValueDto;
import org.springframework.http.ResponseEntity;
public interface IMachineOpenDoorBMO {
--
Gitblit v1.8.0