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

zss

2 天以前 64984c01892d6fe51d8ab550c6a28f2d0e81d6fe

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

@@ -28,6 +28,13 @@
    private Long id;

    /**
     * 状态
     */
    @Excel(name = "状态")
    @TableField(exist = false)
    private String statusName;

    /**
     * 采购台账id
     */
    private Long purchaseLedgerId;