From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 三月 2025 14:24:50 +0800 Subject: [PATCH] 1、git同步冲突引起文件丢失,进行系统恢复,并屏蔽一个非git提交的模块; 2、增加文件《增加一个单位(orgTag)》。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcYearMapper.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcYearMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcYearMapper.java index 6d31cd5..a292f55 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcYearMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcYearMapper.java @@ -1,5 +1,6 @@ package com.dy.pipIrrGlobal.daoSt; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoSt.StConsumeIcYear; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,7 +13,7 @@ * @Description */ @Mapper -public interface StConsumeIcYearMapper { +public interface StConsumeIcYearMapper extends BaseMapper<StConsumeIcYear> { /** * delete by primary key * @param id primaryKey -- Gitblit v1.8.0