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

zhangfeng

2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7

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

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

public class EmergencySuppliesQuery {

    //物资名称
    private String name ;