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-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/RechargeDtoMapper.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/RechargeDtoMapper.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/RechargeDtoMapper.java index 3bddd0e..dcf6502 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/RechargeDtoMapper.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/RechargeDtoMapper.java @@ -3,6 +3,7 @@ import com.dy.pipIrrSell.recharge.DtoRecharge; import org.mapstruct.Mapper; import org.mapstruct.Mapping; +import org.mapstruct.ReportingPolicy; import org.mapstruct.factory.Mappers; /** @@ -12,14 +13,14 @@ * @Description 灏咲toActiveCard鏄犲皠涓篋toRecharge */ -@Mapper +@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface RechargeDtoMapper { RechargeDtoMapper INSTANCT = Mappers.getMapper(RechargeDtoMapper.class); - //@Mapping(target = "cardAddr", source = "cardAddr") - //@Mapping(target = "clientId", source = "clientId") + //@Mapping(target = "cardId", source = "cardId") + @Mapping(target = "clientId", source = "clientId") + @Mapping(target = "cardNum", source = "cardNum") - @Mapping(target = "clientNum", source = "clientNum") @Mapping(target = "amount", source = "amount") @Mapping(target = "paymentId", source = "paymentId") @Mapping(target = "remarks", source = "remarks") -- Gitblit v1.8.0