解决冲突

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCombineBidPageDto.java

-package com.dsk.system.domain.dsk.dto;
+package com.dsk.jsk.domain;
 
-import com.dsk.common.core.domain.model.BasePage;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

dsk-system/src/main/java/com/dsk/system/domain/dsk/vo/JskCombineBidProjectExportVo.java

-package com.dsk.system.domain.dsk.vo;
-
-import com.dsk.common.annotation.Excel;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 集团中标业绩
- * @author lcl
- * @create 2023/8/28
- */
-@Data
-public class JskCombineBidProjectExportVo implements Serializable {
-
-    @Excel(name = "序号",  width = 6)
-    private Integer id;
-
-    @Excel(name = "招标发布时间",  width = 15, dateFormat = "yyyy/MM/dd")
-    private Date issueTime;
-
-    @Excel(name = "招标成员",  width = 30)
-    private String tenderee;
-
-    @Excel(name = "持股比例", suffix = "%" ,  width = 15)
-    private Double stockPercent;
-
-    @Excel(name = "成员等级",  width = 15)
-    private String memberLevel;
-
-    @Excel(name = "项目名称",  width = 50)
-    private String projectName;
-
-    @Excel(name = "预算金额" , suffix = "万元")
-    private Double bidAmount;
-
-    @Excel(name = "项目地区",  width = 20)
-    private String address;
-
-    @Excel(name = "招标采购分类",  width = 15)
-    private String subjectMatter;
-
-    @Excel(name = "项目类型",  width = 15)
-    private String projectType;
-
-    @Excel(name = "代理单位",  width = 30)
-    private String agency;
-
-
-
-
-
-}
-

dsk-system/src/main/java/com/dsk/system/domain/dsk/vo/JskCombineWinBidProjectExportVo.java

-package com.dsk.system.domain.dsk.vo;
-
-import com.dsk.common.annotation.Excel;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 集团中标业绩
- * @author lcl
- * @create 2023/8/28
- */
-@Data
-public class JskCombineWinBidProjectExportVo implements Serializable {
-
-    @Excel(name = "序号",  width = 6)
-    private Integer id;
-
-    @Excel(name = "中标时间",  width = 15, dateFormat = "yyyy/MM/dd")
-    private Date bidTime;
-
-    @Excel(name = "成员名称",  width = 30)
-    private String companyName;
-
-    @Excel(name = "持股比例", suffix = "%" ,  width = 15)
-    private Double stockPercent;
-
-    @Excel(name = "成员等级",  width = 15)
-    private String memberLevel;
-
-    @Excel(name = "项目名称",  width = 50)
-    private String projectName;
-
-    @Excel(name = "中标金额" , suffix = "万元")
-    private Double bidAmount;
-
-    @Excel(name = "中标地区",  width = 20)
-    private String address;
-
-    @Excel(name = "业绩类型",  width = 15)
-    private String boundType;
-
-    @Excel(name = "项目类型",  width = 15)
-    private String projectType;
-
-    @Excel(name = "业主单位",  width = 30)
-    private String projectUnit;
-
-
-
-
-
-}
-