Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-28 e290789c592db88cfbffac7ecbdcd8f998e45796

 server/src/main/java/doumeemes/dao/business/model/CompanyLog.java

@@ -36,6 +36,7 @@

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    @TableField(exist = false)
    private String createUserName;

    @ApiModelProperty(value = "创建时间")