Merge branch 'dev_New_pro' into dev_山西_晋和园_pro

gongchunyi

2026-05-16 c5aac1b321d3840a56ccc41108d42b389d68681e

 src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java

@@ -48,11 +48,11 @@
     */
    @Excel(name = "供应商名称")
    private String supplierName;
     /**
     * 是否白名单
     */
    @Excel(name = "是否白名单")
    private Integer isWhite;
//     /**
//     * 是否白名单
//     */
//    @Excel(name = "是否白名单")
//    private Integer isWhite;

    /**
     * 录入人姓名id