Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

buhuazhen

2 天以前 392366ea36a839e5d0ea05968e6da31cd53a9ee6

 main-business/src/main/java/com/ruoyi/business/entity/PurchaseRegistration.java

@@ -82,10 +82,26 @@
     * 登记人id
     */
    @TableField(value = "registrant_id")
    private String registrantId;
    private Long registrantId;
    /**
     * 登记日期
     */
    @TableField(value = "registration_date")
    private LocalDate registrationDate;
    /**
     * 运费
     */
    @TableField(value = "freight")
    private BigDecimal freight;

    /**
     * 类型（1-成品，2-原料）
     */
    @TableField(value = "type")
    private Integer type;
    /**
     * 采购类型
     */
    @TableField(value = "purchase_type")
    private Integer purchaseType;
}