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

gonglilong

2024-09-13 abde38d6baba3b50df5e39daba87a93c372e0675

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

@@ -103,6 +103,25 @@
     */
    private String videoUrls;

   /**
    * 文件附件
    */
   private String fileUrls;

   /**
    * 图片附件
    */
   private String imageName;

   /**
    * 视频附件
    */
   private String videoName;

   /**
    * 文件附件
    */
   private String fileName;
    /**
     * 审核意见
     */
@@ -118,4 +137,15 @@
    */
   @TableField(exist = false)
   private List<SgGxDO> sgGxDOS;

   /**
    *是否重新提交 0是 ，1否
    */
   private Integer resubmit;

   /**
    * 重新上报单据ID
    */
   @TableField(exist = false)
   private String resubmitId;
}