Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b

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

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

   @TableField(exist = false)
   @ApiModelProperty(value = "图片名称")
   private String svgContent;

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