Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信

gongchunyi

2026-08-12 c7ef427794795bddb10585eda2c5e43f0c2970bc

 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;