Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-07 c28d3bb363dde2afb44c168b93379b2bf6b1f67f

 production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java

@@ -55,6 +55,11 @@
     **/
    private Integer manufactureOrderId;

    /**
     * 关联 标准BOM工艺路线id
     **/
    private Integer technologyId;

    @ApiModelProperty(value = "逻辑删除 正常>=1,删除<=0", hidden = true)
    @TableLogic(value = "1", delval = "0")
    private Integer state;