合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 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 {