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

buhuazhen

7 天以前 3ef1cf899c2bf558b934fd2c5dfdf0a970df8c43

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

@@ -44,6 +44,7 @@
     */
    @TableField(value = "supplier_name")
    private String supplierName;

    /**
     * 供货商名称
     */
@@ -64,6 +65,12 @@
     */
    @TableField(value = "unit")
    private String unit;

    /**
     * 编码
     */
    @TableField(value = "code")
    private String code;
    /**
     * 库存数量
     */