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

doum

10 天以前 a291dd70f178d32f8b582a9c6ed1a73b5a81a62e

 server/system_service/src/main/java/com/doumee/dao/business/model/Company.java

@@ -43,7 +43,8 @@
    @ApiModelProperty(value = "更新人编码")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "姓名拼音首字母")
    private String pinyin;
    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    private Date editDate;