zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zcc'

Browse Source 
# Conflicts:
#	src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java
This commit is contained in:
wangjinlei
2024-05-30 14:35:00 +08:00
parent cda9eb9ae7 ed90ee561c
commit deefb27ee4
4 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java
View File

@@ -3,18 +3,15 @@ package com.peanut.modules.common.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.R;
import com.peanut.modules.common.dao.ShopStoreToProductDao;
import com.peanut.modules.common.dao.TaihuWelfareDao;
import com.peanut.modules.common.entity.ShopProduct;
import com.peanut.modules.common.entity.ShopStoreToProductEntity;
import com.peanut.modules.common.entity.TaihuWelfareEntity;
import com.peanut.modules.common.service.TaihuWelfareService;
import com.peanut.modules.common.to.ParamTo;
import org.springframework.beans.factory.annotation.Autowired;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service("commonTaihuWelfareService")
public class TaihuWelfareServiceImpl extends ServiceImpl<TaihuWelfareDao, TaihuWelfareEntity> implements TaihuWelfareService {
@Autowired