Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-12-23 5bd5f3bcd6d2cb375feb0756505691b551339716

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesQuery.java

@@ -2,6 +2,7 @@

public class EmergencySuppliesQuery {

    //物资名称
    private String name ;