Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

skyouc

4 天以前 add402ec68d150cd8b13c231ce991cf49889259c

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

@@ -34,13 +34,13 @@

    @Excel(name = "货主标识")
    @ExcelComment(example = "123")
    private Long shipperId;
    private String shipperId;


    @NotNull
    @Excel(name = "物料分组")
    @ExcelComment(example = "手机")
    private Long groupId;
    private String groupId;


    @Excel(name = "ERP编码")