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

ke

2024-11-26 b672cafe6a447c9b19691b583df9542ad84bce2c

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

@@ -55,6 +55,8 @@
    */
   @TableField(exist = false)
   private String deviceProgress;

   @TableField(exist = false)
   private String progress;
   /**
    * 项目id
@@ -105,4 +107,9 @@

   private Integer status;

   /**
    * 价格
    */
   private String price;

}