Merge remote-tracking branch 'origin/master'

doum

2 天以前 c29a4c8f6022e6cd5ff92d499c8db829c8c471aa

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

@@ -304,5 +304,8 @@
    @ApiModelProperty(value = "经销商名称 ")
    @TableField(exist = false)
    private String shopName;
    @ApiModelProperty(value = "是否需要统计 ")
    @TableField(exist = false)
    private Boolean needCount;

}