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

lbq

4 天以前 912b4dab5f847ab1108b18df1b5e06e85c71881e

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

@@ -271,6 +271,11 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    private String baseUnit;
    private String useOrgId;
    private String useOrgName;
    private String erpClsId;

    /**
     * 备注
     */