Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-07-16 debe5f0c7882fe0b612d6e5c3af4805112d7c6e2

 gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java

@@ -9,6 +9,7 @@
import com.xzx.gc.user.dto.DistribDataListDto;
import com.xzx.gc.user.dto.DistribInfoListDto;
import com.xzx.gc.user.dto.DistribListDto;
import com.xzx.gc.user.dto.ExportDistribDataListDto;
import com.xzx.gc.user.vo.*;
import com.xzx.gc.util.GcMapper;
import org.apache.ibatis.annotations.Param;
@@ -62,6 +63,14 @@

    List<JhyOrderItems> selectOrderById(@Param("orderId")Long orderId);

    List<DistribDataListVo> distribDataList(DistribDataListDto distribDataListDto);
    List<DistribDataListVo> distribDataList(@Param("record")DistribDataListDto distribDataListDto);

    String selectOrderByHeadUserId(@Param("accountId")String accountId);

    String selectJDSLByHeadUserId(@Param("accountId")String id);

    DistribDataInfoVo selectDistribDataInfoVo();

    List<DistribDataListVo> distribDataExport(@Param("record")ExportDistribDataListDto distribDataListDto);
}