fix conflict

Helius

2020-12-11 37b2fa02d4e9540b67f9ec02740d7720ec38df3a

1
2
3
4
5
6
7
8
9
package com.matrix.system.shopXcx.api.service;
 
import com.matrix.core.pojo.AjaxResult;
import com.matrix.system.shopXcx.dto.CreateSecKillDTO;
 
public interface WxShopActivitiesSecKillService {
 
    public AjaxResult createSecKillOrder(CreateSecKillDTO createSecKillDTO) throws Exception;
}