From c217a5094b0c0aa308d960c0b2e8b8295a5361a3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 22 五月 2024 20:02:37 +0800
Subject: [PATCH] Merge branch 'dev-mitao'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java
index 0537e97..722fcbc 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java
@@ -50,7 +50,7 @@
Page<GoodsBrand> page = this.lambdaQuery()
.like(StringUtils.isNotEmpty(query.getBrandName()), GoodsBrand::getBrandName,
query.getBrandName())
- .page(new Page<GoodsBrand>(query.getPageCurr(), query.getPageSize()));
+ .page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page.getTotal(), page.getPages());
}
@@ -63,7 +63,6 @@
*
* @param dto 商品品牌数据传输对象，包含商品品牌的信息。 如果dto中的id为空，则认为是新品牌，调用save方法保存；
* 如果id不为空，则认为是更新已有品牌，调用updateById方法更新。
- * @return 无返回值
*/
@Override
public void saveGoodsBrand(GoodsBrandDTO dto) {
--
Gitblit v1.7.1