Merge branch 'master' into master-任务组

陈昶聿

9 天以前 521959e291147717c8b0258dbf6a076e4b04d8cd

 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;

}