From bf30c46bcec220d74cf76a7181b037b7b89f92e8 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 2 Dec 2024 18:04:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=AF=BC=E5=87=BA=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../purchase/domain/PurchaseCheckInfo.java | 18 +++++++++---------
.../purchase/PurchaseCheckInfoMapper.xml | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
index 4db98e59..bb659ca1 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
@@ -42,20 +42,20 @@ public class PurchaseCheckInfo extends BaseEntity {
private String code;
/** 采购日期 */
- @Excel(name = "采购日期", sort = 1)
- @ApiModelProperty(value = "采购日期")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date purchaseTime;
+// @Excel(name = "采购日期", sort = 1)
+// @ApiModelProperty(value = "采购日期")
+// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+// private Date purchaseTime;
/** 到货日期 */
@ApiModelProperty(value = "到货日期")
@NotNull(message = "到货日期不能为空")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Excel(name = "到货日期", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "到货日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 1)
private Date arrivalTime;
/** 采购员 */
- @Excel(name = "采购员")
+ //@Excel(name = "采购员")
@ApiModelProperty(value = "采购员")
private Long purchaser;
@@ -109,9 +109,9 @@ public class PurchaseCheckInfo extends BaseEntity {
@Size(max = 100, message = "税率长度必须介于 0 和 100 之间")
private BigDecimal taxRate;
- @Excel(name = "操作人", sort = 9)
- @ApiModelProperty(value = "操作人名称")
- private String createUserName;
+ //@Excel(name = "购买人", sort = 9)
+ @ApiModelProperty(value = "购买人名称")
+ private String purchaseName;
@ApiModelProperty(value = "新购模块阶段名称")
private String modelName;
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
index 0fc90673..296b1420 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml
@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+