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/TPhysicalGoodsController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsController.java
index c762579..a923002 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsController.java
@@ -74,7 +74,7 @@
public R<Page<TPhysicalGoods>> pageList(@RequestBody BigGiftPackageQuery query) {
Page<TPhysicalGoods> tPhysicalGoodsPage = new Page<>(query.getPageNum(), query.getPageSize());
LambdaQueryWrapper<TPhysicalGoods> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TPhysicalGoods::getStatus,1);
+ wrapper.eq(TPhysicalGoods::getStatus,0);
wrapper.like(Objects.nonNull(query.getName()), TPhysicalGoods::getName, query.getName());
wrapper.orderByDesc(TPhysicalGoods::getCreateTime);
Page<TPhysicalGoods> pageInfo = tPhysicalGoodsService.page(tPhysicalGoodsPage, wrapper);
@@ -160,7 +160,7 @@
}
}
- @Log(title = "实物商品-导入", businessType = BusinessType.INSERT)
+ @Log(title = "实物商品-导入", businessType = BusinessType.IMPORT)
@ApiOperation(value = "实物商品-导入")
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
@PostMapping("/import")
@@ -244,7 +244,7 @@
public void exportRegistration(@RequestBody BigGiftPackageQuery query){
LambdaQueryWrapper<TPhysicalGoods> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TPhysicalGoods::getStatus,1);
+ wrapper.eq(TPhysicalGoods::getStatus,0);
wrapper.like(Objects.nonNull(query.getName()), TPhysicalGoods::getName, query.getName());
wrapper.orderByDesc(TPhysicalGoods::getCreateTime);
List<TPhysicalGoods> list = tPhysicalGoodsService.list(wrapper);
--
Gitblit v1.7.1