diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java index 1ef75e5..88ae428 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java @@ -80,4 +80,8 @@ public class TemplateInstanceRespVO { @ExcelProperty("创建人") private String creator; + @Schema(description = "创建人名", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建人名") + private String creatorName; + } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java index fd062c6..99b718e 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java @@ -13,7 +13,7 @@ public interface TmplItmMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TmplItmDO::getItmVal, reqVO.getItmVal()) .likeIfPresent(TmplItmDO::getItmName, reqVO.getItmName()) - .eqIfPresent(TmplItmDO::getItmNum, reqVO.getItmNum()) + .likeIfPresent(TmplItmDO::getItmNum, reqVO.getItmNum()) .eqIfPresent(TmplItmDO::getRmk, reqVO.getRmk()) .betweenIfPresent(TmplItmDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(TmplItmDO::getId)); diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/PrchOrdDtlDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/PrchOrdDtlDTO.java index 37edaea..599b0f3 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/PrchOrdDtlDTO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/PrchOrdDtlDTO.java @@ -62,7 +62,7 @@ public class PrchOrdDtlDTO { * 计量单位;推送ERP(必须) */ - private BigDecimal unt; + private String unt; /** * 含税单价;推送ERP(必须) */