Merge remote-tracking branch 'origin/master'

zss

2023-11-15 6c264ce8c372e18109f0a3b9f5754955d22ba353

 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;

    }