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

whycq

2024-07-04 c1a75fbe8a68c9e4dfd2c161375dc325a5c13989

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

@@ -323,4 +323,6 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }



}