Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-08-22 652fca264c2468782a2d5a4fbe21a13df448b91a

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java

@@ -216,4 +216,5 @@
    public void setMemo(String memo) {
        this.memo = memo;
    }

}