Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 c80aedf517205fd50e608efc17ead73a3667d506

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

@@ -57,4 +57,7 @@
   @ApiModelProperty(value = "子节点")
   @TableField(exist = false)
   private List<XhProductModel> children = new ArrayList<>();

   @TableField(exist = false)
   private Long paramId;
}