Merge remote-tracking branch 'origin/master'

liusheng

21 小时以前 e1e290cbef86b5a5c58b8ef238424373f00ed00b

 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;

}