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

shenyijian

2024-06-24 7d44d7a2a9ee8f55e911d678d78ff25f047cab4d

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java

@@ -1,5 +1,6 @@
package cn.gistack.sm.sg.DO;

import cn.gistack.sm.sg.VO.SgTypeVO;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
@@ -169,7 +170,10 @@


   @TableField(exist = false)
   private List<SgGxDO> sgGxDOS;
   private List<SgTypeVO> sgGxDOS;

   private Integer status;

   @TableField(exist = false)
   private String projectProgress;
}