Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-05 16cee07f274c039bf0dcb5da347859053b7c2586

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