解决冲突

huang

2025-11-17 e76f0739e647fe8a7e0e2618914e2faff554b1b7

 mes-processes/mes-plcSend/src/main/java/com/mes/mapper/PlcAddressMapper.java

@@ -1,16 +1,16 @@
package com.mes.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.entity.PlcAddressMapping;
import com.mes.entity.PlcAddress;
import org.apache.ibatis.annotations.Mapper;

/**
 * PLC地址映射配置Mapper
 * 
 * @author zhoush
 * @author huang
 * @date 2025/10/30
 */
@Mapper
public interface PlcAddressMappingMapper extends BaseMapper<PlcAddressMapping> {
public interface PlcAddressMapper extends BaseMapper<PlcAddress> {
    
}