Merge remote-tracking branch 'origin/master'

doum

21 小时以前 ae917e09a897843344424ca7d36dd22c216f5f50

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

@@ -203,6 +203,13 @@
    @ApiModelProperty(value = "经销商结算金额", example = "1")
    private BigDecimal shopSettlement;

    @ApiModelProperty(value = "返还经销商积分", example = "1")
    private BigDecimal returnCustomerIntegral;

    @ApiModelProperty(value = "返还用户积分", example = "1")
    private BigDecimal returnMemberIntegral;


    @ApiModelProperty(value = "文件地址")
    @TableField(exist = false)
    private String resourcePath;
@@ -245,15 +252,17 @@

    @ApiModelProperty(value = "订单总数 ")
    @TableField(exist = false)
    private Integer orderCount;

    private Long orderCount;
    @ApiModelProperty(value = "订单商品总数 ")
    @TableField(exist = false)
    private Long goodsCount;
    @ApiModelProperty(value = "订单总额 ")
    @TableField(exist = false)
    private BigDecimal orderMoneyCount;

    @ApiModelProperty(value = "本月订单总数 ")
    @TableField(exist = false)
    private Integer orderMonthCount;
    private Long orderMonthCount;

    @ApiModelProperty(value = "本月订单总额 ")
    @TableField(exist = false)