Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

3 天以前 09d4077e7343fa3105ae1bed901c0f10027f97b4

 ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmBranchArea.java

@@ -31,7 +31,7 @@
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "分公司名称")
    @ApiModelProperty(value = "分公司id")
    @TableField("branch_id")
    private String branchId;