Merge branch 'master' into master-任务组

陈昶聿

6 小时以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

 smartor/src/main/java/com/smartor/domain/BingRenXX.java

@@ -20,8 +20,8 @@

    @ApiModelProperty(value = "组织机构铝箔")
    public String ZuZhiJGMC;

    @ApiModelProperty(value = "机构ID")
    public String orgid;
//
//    @ApiModelProperty(value = "机构ID")
//    public String orgid;

}