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

jiaosong

2023-10-25 cc3bbf14c5fde619c23e5502c8583889e94deacc

 server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java

@@ -48,7 +48,7 @@

    @ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")
    @ExcelColumn(name="是否已删除 0未删除 1已删除")
    @TableLogic
//    @TableLogic
    private Integer isdeleted;

    @ApiModelProperty(value = "名称")