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

chen.lin

2026-02-24 a40ecf9cc55abc8dafbd19391d82040b70b590c2

 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;