Merge remote-tracking branch 'origin/master'

zouyu

2023-11-17 2b0dc519ddc4fefcabc7f60dcda4968964155e11

 mes-technology/src/main/java/com/chinaztt/mes/technology/entity/RoutingOperationParam.java

@@ -89,4 +89,8 @@
     */
    @ApiModelProperty(value="工艺参数值")
    private String paramValue;

   @ApiModelProperty("父级id")
   private Long parentId;

    }