Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-18 fc5ac628bb8031c33a37dfc49990b7fe84757ef4

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java

@@ -1,7 +1,9 @@
package com.ycl.platform.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.YwPeople;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import lombok.Data;
@@ -36,6 +38,9 @@
    /** 联系电话 */
    private String phone;

    /** 备注 */
    private String remark;

    public static YwPeopleVO getVoByEntity(@NonNull YwPeople entity, YwPeopleVO vo) {
        if(vo == null) {
            vo = new YwPeopleVO();