Merge remote-tracking branch 'origin/master' into xin

zepengdev

2025-06-19 85292b84f3ece751e0c55e372e1c74a647ed93f9

Merge remote-tracking branch 'origin/master' into xin

# Conflicts:
#	oying-system/src/main/java/com/oying/modules/message/service/MessageSystemAdvertiseService.java
#	oying-system/src/main/java/com/oying/modules/pc/product/service/ProductCategoryService.java
#	oying-system/src/main/java/com/oying/modules/security/rest/VerificationController.java
#	oying-system/src/main/java/com/oying/modules/sh/domain/OrderAddressSnapshot.java
#	oying-system/src/main/java/com/oying/modules/system/domain/User.java
#	oying-system/src/main/java/com/oying/modules/system/service/UserMerchantService.java
#	oying-system/src/main/resources/mapper/system/UserMapper.xml
#	oying-tools/src/main/java/com/oying/utils/SendMessageUtils.java
#	oying-tools/src/main/java/com/oying/utils/WinnerLookEnum.java

 oying-system/src/main/java/com/oying/modules/system/service/UserMerchantService.java

@@ -1,59 +0,0 @@
package com.oying.modules.system.service;

import com.oying.modules.system.domain.UserMerchant;
import com.oying.modules.system.domain.dto.UserMerchantQueryCriteria;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.oying.utils.PageResult;

/**
* @description 服务接口
* @author lixin
* @date 2025-06-16
**/
public interface UserMerchantService extends IService<UserMerchant> {

    /**
    * 查询数据分页
    * @param criteria 条件
    * @param page 分页参数
    * @return PageResult
    */
    PageResult<UserMerchant> queryAll(UserMerchantQueryCriteria criteria, Page<Object> page);

    /**
    * 查询所有数据不分页
    * @param criteria 条件参数
    * @return List<UserMerchantDto>
    */
    List<UserMerchant> queryAll(UserMerchantQueryCriteria criteria);

    /**
    * 创建
    * @param resources /
    */
    void create(UserMerchant resources);

    /**
    * 编辑
    * @param resources /
    */
    void update(UserMerchant resources);

    /**
    * 多选删除
    * @param ids /
    */
    void deleteAll(List<Long> ids);

    /**
    * 导出数据
    * @param all 待导出的数据
    * @param response /
    * @throws IOException /
    */
    void download(List<UserMerchant> all, HttpServletResponse response) throws IOException;
}