Merge remote-tracking branch 'origin/master'

doum

12 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Integral.java

@@ -102,11 +102,26 @@
    @TableField(exist = false)
    private Date endtime;

    @ApiModelProperty(value = "交易类型")
    @TableField(exist = false)
    @ExcelColumn(name="交易类型",index =5,width = 10)
    private String strObjType;


    @TableField(exist = false)
    @ApiModelProperty(value = "提现状态:：0=审批中；1=审批通过；2=审批驳回")
    private Integer withdrawStatus;


    @ApiModelProperty(value = "总收入 ")
    @TableField(exist = false)
    private BigDecimal inAmount;
    @ApiModelProperty(value = "总支出 ")
    @TableField(exist = false)
    private BigDecimal outAmount;




//    public static  Integral createIntegral(Integer memberId, Constants.INTEGRAL_TYPE integralType,Integer objId){
//        Integral integral = new Integral();