Merge remote-tracking branch 'origin/master'

Junjie

1 天以前 2ed2c79a60bea2e05272f11324a0fd148414ae43

 src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java

@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;

import com.zy.asrs.entity.DeviceDataLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;