Merge remote-tracking branch 'origin/master'

jiangping

2025-06-30 ff580fa1e1cb7664159823135f7486048c768615

Merge remote-tracking branch 'origin/master'

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CompanyDocuments.java

@@ -33,7 +33,6 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java

@@ -157,6 +157,7 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda().eq(Category::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Category::getName,pageWrap.getModel().getName())
                .isNull(Category::getParentId)
                .orderByDesc(Category::getSortnum);
        PageData<Category> categoryPageData = PageData.from(categoryMapper.selectPage(page, queryWrapper));