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

lyfO_o

2022-07-01 f8c25d1fab78aa4e0a6bdb10f91e61698af434c4

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfoDo.java

@@ -4,5 +4,5 @@

    private String name;

    private Byte
    private Byte status;
}