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

gongchunyi

2026-02-13 74edc58b0d751f788da1d7a7e3fb241f946c5072

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

 src/main/java/com/ruoyi/account/pojo/AccountExpense.java

@@ -48,9 +48,9 @@
    private Date expenseDate;

    /**
     * 支出类型(办公用品，员工工资，差旅费，设备费用，其他)
     * 支出类型(办公用品，员工工资，差旅费，设备费用，来票付款，其他)
     */
    @Excel(name = "支出类型",readConverterExp = "0=办公用品,1=员工工资,2=差旅费,3=设备费用,4=其他")
    @Excel(name = "支出类型",readConverterExp = "0=办公用品,1=员工工资,2=差旅费,3=设备费用,4=来票付款,5=其他")
    @NotBlank(message = "支出类型不能为空!!")
    private String expenseType;


 src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java

@@ -127,7 +127,7 @@
            // 2. 处理账户支出
            AccountExpense accountExpense = new AccountExpense();
            accountExpense.setExpenseDate(purchaseLedger.getEntryDate());
            accountExpense.setExpenseType("0");
            accountExpense.setExpenseType("4");
            accountExpense.setSupplierName(purchaseLedger.getSupplierName());
            accountExpense.setExpenseMoney(paymentRegistration.getCurrentPaymentAmount());
            accountExpense.setExpenseDescribed("付款支出");