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

zss

9 天以前 62c49918cea8ceae5ccbba45058c7eb3ef9a2f23

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

@@ -148,10 +148,14 @@
    @TableField(exist = false)
    private Integer type;



    @ApiModelProperty(value = "付款方式")
    private String paymentMethod;
    @ApiModelProperty("审批状态")
    private Integer approvalStatus;

    @ApiModelProperty(value = "模板名称")
    private String templateName;
    @ApiModelProperty(value = "审批人id")
    private Integer approverId;

}