Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

7 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java

@@ -108,6 +108,9 @@
    @ApiModelProperty(value = "子集分类")
    @TableField(exist = false)
    private List<Category> childCategoryList;
    @ApiModelProperty(value = "客户集合")
    @TableField(exist = false)
    private List<JkCustomer> customerList;


}