Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

zhangc

2025-01-20 ce7423ed32c2a427fe508909c41b9cd0dbfd2f58

 src/main/java/com/zy/asrs/entity/AgvWarn.java

@@ -47,6 +47,9 @@
    @TableField("modi_time")
    private Date modiTime;

//    @TableField("report_time")
//    private Date reportTime;

    @TableField("memo")
    private String memo;