Merge remote-tracking branch 'origin/master'

zouyu

2023-11-15 54cce185f383849322d5cc309d2ee5d155d15915

 mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Param.java

@@ -104,6 +104,9 @@
   @ApiModelProperty(value="数据字典")
   private String dict;

   @TableField(exist = false)
   private String paramValue;

   @ApiModelProperty(value="父级参数")
   @TableField("parent_id")
   @JSONField(serializeUsing= ToStringSerializer.class)