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

doum

昨天 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

 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;