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

skyouc

2025-10-21 add402ec68d150cd8b13c231ce991cf49889259c

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java

@@ -16,7 +16,7 @@
    private String matnr;

    @ApiModelProperty("物料分组")
    private Long groupName;
    private String groupName;

    @ApiModelProperty("型号")
    private String model;