Merge remote-tracking branch 'origin/master'

doum

15 小时以前 7b223c4dfdc960a6172bac87e47ab1b86b90ba1a

 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;