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

yaowanxin

14 小时以前 2be90eb75452c8f0820d89cb1cd018dd86a351e0

 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;