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

doum

4 小时以前 cb6aca0642ac8dd5de877ade168066d85acb589c

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

@@ -93,11 +93,24 @@
    @ExcelColumn(name="组合名称",index = 3,width = 20)
    private String groupName;
    @ApiModelProperty(value = "完整图片地址 ")
    @TableField(exist = false)
    private String imgurlFull;
    @ApiModelProperty(value = "线路数 ")
    @TableField(exist = false)
    private int lineNum;
    @ApiModelProperty(value = "完成线路计算客户数 ")
    @TableField(exist = false)
    private int customerDoneNum;
    @ApiModelProperty(value = "客户数 ")
    @TableField(exist = false)
    private int customerNum;

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


}