Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/endpoint/SiterwellDeviceController.java

@@ -20,9 +20,9 @@ import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping("/siterwelldevice")
@Api(value = "onenet设备相关服务", description = "onenet设备相关服务")
public class SiterwellDeviceController extends BaseController{
public class OnenetController extends BaseController{
    private static Logger logger = LoggerFactory.getLogger(SiterwellDeviceController.class);
    private static Logger logger = LoggerFactory.getLogger(OnenetController.class);
    //用户自定义token和OneNet第三方平台配置里的token一致(配置http推送时使用)
    private static String token ="jkzl2021";