From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreAuditQueryCriteria.java | 4 ++++
oying-system/src/main/resources/mapper/pc/store/StoreAuditMapper.xml | 3 +++
oying-system/src/main/resources/mapper/pc/product/ProductAuditMapper.xml | 3 +++
oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductAuditQueryCriteria.java | 4 ++++
4 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductAuditQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductAuditQueryCriteria.java
index 940cc4b..d91c32d 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductAuditQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductAuditQueryCriteria.java
@@ -21,9 +21,13 @@
@ApiModelProperty(value = "类型")
private String type;
+ @ApiModelProperty(value = "审核状态")
+ private Integer status;
+
@ApiModelProperty(value = "页码", example = "1")
private Integer page = 1;
@ApiModelProperty(value = "每页数据量", example = "10")
private Integer size = 10;
+
}
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreAuditQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreAuditQueryCriteria.java
index e5a05ed..a9216ad 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreAuditQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreAuditQueryCriteria.java
@@ -21,9 +21,13 @@
@ApiModelProperty(value = "类型")
private String type;
+ @ApiModelProperty(value = "审核状态")
+ private Integer status;
+
@ApiModelProperty(value = "页码", example = "1")
private Integer page = 1;
@ApiModelProperty(value = "每页数据量", example = "10")
private Integer size = 10;
+
}
diff --git a/oying-system/src/main/resources/mapper/pc/product/ProductAuditMapper.xml b/oying-system/src/main/resources/mapper/pc/product/ProductAuditMapper.xml
index f36506a..a7f5155 100644
--- a/oying-system/src/main/resources/mapper/pc/product/ProductAuditMapper.xml
+++ b/oying-system/src/main/resources/mapper/pc/product/ProductAuditMapper.xml
@@ -31,6 +31,9 @@
<if test="criteria.type != null and criteria.type != ''">
and type = #{criteria.type}
</if>
+ <if test="criteria.status != null">
+ and status = #{criteria.status}
+ </if>
</where>
order by audit_id desc
</select>
diff --git a/oying-system/src/main/resources/mapper/pc/store/StoreAuditMapper.xml b/oying-system/src/main/resources/mapper/pc/store/StoreAuditMapper.xml
index 12cfa20..45844e3 100644
--- a/oying-system/src/main/resources/mapper/pc/store/StoreAuditMapper.xml
+++ b/oying-system/src/main/resources/mapper/pc/store/StoreAuditMapper.xml
@@ -31,6 +31,9 @@
<if test="criteria.type != null and criteria.type != ''">
and type = #{criteria.type}
</if>
+ <if test="criteria.status != null">
+ and status = #{criteria.status}
+ </if>
</where>
order by audit_id desc
</select>
--
Gitblit v1.9.3