Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

22 小时以前 10776dd6f7f9ef9e47419427fcb1b692ed73d54d

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java

@@ -60,6 +60,8 @@
    @ApiModelProperty(value= "上级分类ID")
    private Long parentId;

    private Integer sort;

    /**
     * 状态 1: 正常  0: 冻结  
     */