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

admin

2021-08-27 38d7ec7ea772a6f48a0409f2fcbbcde05364ec7b

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

@@ -128,5 +128,4 @@
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

}