Merge remote-tracking branch 'origin/master'

xyc

2024-05-17 4a476243e0928236472f0a916467630cb5706ee5

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/model/SysPictureBase.java

@@ -29,6 +29,9 @@

   @ApiModelProperty(value = "图片高度")
   private Integer height;

   @ApiModelProperty(value = "svg图片")
   private String svgContent;

   @ApiModelProperty(value = "检索关键字")
   private String contentType;