食谱计划页面弹窗样式优化、按天提成列表增加一列
This commit is contained in:
		@@ -37,6 +37,9 @@ public class SysCommissionDayDetail extends BaseEntity {
 | 
			
		||||
    @Excel(name = "未发放提成")
 | 
			
		||||
    private BigDecimal totalNotSentCommissionAmount;
 | 
			
		||||
 | 
			
		||||
    @Excel(name = "下月应发提成")
 | 
			
		||||
    private BigDecimal nextMonthCommission;
 | 
			
		||||
 | 
			
		||||
    private List<Map<String, Object>> sendDetailList;
 | 
			
		||||
 | 
			
		||||
    public Long getUserId() {
 | 
			
		||||
@@ -110,4 +113,12 @@ public class SysCommissionDayDetail extends BaseEntity {
 | 
			
		||||
    public void setSendDetailList(List<Map<String, Object>> sendDetailList) {
 | 
			
		||||
        this.sendDetailList = sendDetailList;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public BigDecimal getNextMonthCommission() {
 | 
			
		||||
        return nextMonthCommission;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public void setNextMonthCommission(BigDecimal nextMonthCommission) {
 | 
			
		||||
        this.nextMonthCommission = nextMonthCommission;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -29,9 +29,12 @@ public class SysRecipesPlan extends BaseEntity
 | 
			
		||||
    private String customer;
 | 
			
		||||
 | 
			
		||||
    //非持久化字段,客户手机号
 | 
			
		||||
    @Excel(name = "客户手机号")
 | 
			
		||||
    private String phone;
 | 
			
		||||
 | 
			
		||||
    @Excel(name = "客户手机号")
 | 
			
		||||
    //处理过的客户手机号
 | 
			
		||||
    private String hidePhone;
 | 
			
		||||
 | 
			
		||||
    /** 食谱开始日期 */
 | 
			
		||||
    @JsonFormat(pattern = "yyyy-MM-dd")
 | 
			
		||||
    @Excel(name = "食谱开始日期", width = 30, dateFormat = "yyyy-MM-dd")
 | 
			
		||||
@@ -217,6 +220,14 @@ public class SysRecipesPlan extends BaseEntity
 | 
			
		||||
        this.phone = phone;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public String getHidePhone() {
 | 
			
		||||
        return hidePhone;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public void setHidePhone(String hidePhone) {
 | 
			
		||||
        this.hidePhone = hidePhone;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public String toString() {
 | 
			
		||||
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user