Merge remote-tracking branch 'origin/master'

doum

15 小时以前 0982a97b0c65e11034b9d6b00cc0e4aba39254be

 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;

}