Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b

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

@@ -47,6 +47,8 @@
   @ApiModelProperty(value = "图片名称")
   private String operatImgName;

   private String equipType;

   @ApiModelProperty(value = "排序")
   private Integer sort;