Merge remote-tracking branch 'origin/master'

Fixiaobai

2023-11-03 279b381d288cf6d1358408684d308d50ef3dd7a5

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

@@ -103,4 +103,12 @@
    */
   @ApiModelProperty(value="数据字典")
   private String dict;
    }

   @ApiModelProperty(value="父级参数")
   @TableField("parent_id")
   private Long parentId;

   public Param() {
      this.parentId=0L;
   }
}