Merge branch 'dev'

fuliqi

2025-02-14 c6976365d5bfb39a32db8b541b1fe3ceb30c7826

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

@@ -1,5 +1,6 @@
package com.ycl.platform.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.YwPoint;
@@ -68,6 +69,10 @@
     */
    private List<DynamicColumnVO> dynamicColumnList;

    /** 设备登录的用户名密码 */
    private String username;
    private String password;

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