Merge remote-tracking branch 'origin/master'

zouyu

2023-11-15 54cce185f383849322d5cc309d2ee5d155d15915

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

@@ -60,5 +60,7 @@
   @TableField(updateStrategy = FieldStrategy.IGNORED)
   @ApiModelProperty(value = "默认值")
   private String defaultValue;

   private Long parentId;
}