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/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java

@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;

public class EmergencySuppliesMaintainUserRespDTO {

    //人呀名称
    private String userName;

    public String getUserName() {
@@ -13,8 +13,9 @@
    }

    private Long id;

    //保养id
    private Long maintainId;
    //保养人uid
    private Long userUid;

    public Long getId() {