解决冲突

fujunling

2023-06-16 3bcd305ef9408ae54f7ef62b8472d0813ae34333

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/mapper/LogErrorMapper.java

@@ -17,7 +17,8 @@
package com.vci.ubcs.core.log.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.core.log.model.LogError;
import org.springblade.core.log.model.LogError;


/**
 * Mapper 接口