From 3d3284f5ba3eff6f92228e0703a4f5ace4cbf343 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 15 十二月 2025 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageController.java
index 1a01bc0..cc20a70 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBigGiftPackageController.java
@@ -68,7 +68,7 @@
public R<Page<TBigGiftPackage>> pageList(@RequestBody BigGiftPackageQuery query) {
Page<TBigGiftPackage> tBigGiftPackagePage = new Page<>(query.getPageNum(), query.getPageSize());
LambdaQueryWrapper<TBigGiftPackage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TBigGiftPackage::getStatus,1);
+ wrapper.eq(TBigGiftPackage::getStatus,0);
wrapper.like(Objects.nonNull(query.getName()), TBigGiftPackage::getName, query.getName());
wrapper.orderByDesc(TBigGiftPackage::getCreateTime);
@@ -156,7 +156,7 @@
}
}
- @Log(title = "大礼包商品-导入", businessType = BusinessType.INSERT)
+ @Log(title = "大礼包商品-导入", businessType = BusinessType.IMPORT)
@ApiOperation(value = "大礼包商品-导入")
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
@PostMapping("/import")
@@ -268,7 +268,7 @@
public void exportRegistration(@RequestBody BigGiftPackageQuery query){
LambdaQueryWrapper<TBigGiftPackage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TBigGiftPackage::getStatus,1);
+ wrapper.eq(TBigGiftPackage::getStatus,0);
wrapper.like(Objects.nonNull(query.getName()), TBigGiftPackage::getName, query.getName());
wrapper.orderByDesc(TBigGiftPackage::getCreateTime);
List<TBigGiftPackage> list = tBigGiftPackageService.list(wrapper);
--
Gitblit v1.7.1