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

maven

2026-01-14 43a8301f04a6ea7891ef16861734163b2646e07f

 src/main/java/com/ruoyi/basic/pojo/ProductModel.java

@@ -27,6 +27,9 @@
    @Excel(name = "产品名称")
    private String productName;

    @Excel(name = "产品编码")
    private String productCode;

    /**
     * 规格型号
     */