Merge remote-tracking branch 'origin/master'

xyc

2024-11-05 5f77609d5118737e135c6ca3add168ad01aa52b6

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java

@@ -60,6 +60,7 @@
   private Integer sort;

   @ApiModelProperty(value = "同类设备数量")
   @TableField(exist = false)
   private Integer sameSbNum;