Merge remote-tracking branch 'origin/master'

rk

18 小时以前 511ce651667f5b2284247cc60599078b86f7963f

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

@@ -123,5 +123,8 @@
    @ApiModelProperty(value = "统计量")
    @TableField(exist = false)
    private BigDecimal totalNum;
    @ApiModelProperty(value = "小计")
    @TableField(exist = false)
    private BigDecimal totalPrice;

}