Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-05 52a40b6db35456112d8a470fc0e7f68207be6bfe

1
2
3
4
5
6
7
8
9
10
11
package com.stylefeng.guns.modular.system.dao;
 
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.MerchantActivitySlave;
 
import java.util.List;
import java.util.Map;
 
public interface MerchantActivitySlaveMapper extends BaseMapper<MerchantActivitySlave> {
    List<Map<String, Object>> getActivitySlaveList(Integer id);
}