Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

yuan

2026-05-22 d08e95f9a5a86c75ba7b8cd1e23b50a4eac41bff

 src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java

@@ -69,10 +69,10 @@
    private Integer type;

    @Schema(description = "产品id")
    private Integer productId;
    private Long productId;

    @Schema(description = "型号id")
    private Integer productModelId;
    private Long productModelId;

    private String register;