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/Matnr.java

@@ -224,6 +224,7 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    @ApiModelProperty("动态扩展字段")
@@ -270,6 +271,11 @@
    @ApiModelProperty(value= "备注")
    private String memo;

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

    /**
     * 备注
     */