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

songhuangfeng123

2022-08-12 5ed84eaec030109b0e6b77ae2667ed56e959871b

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

@@ -9,6 +9,16 @@
@TableName("emergency_drill_evaluation")
public class EmergencyDrillEvaluationInfoPageDO {

    private String emergencyPlanName;

    public String getEmergencyPlanName() {
        return emergencyPlanName;
    }

    public void setEmergencyPlanName(String emergencyPlanName) {
        this.emergencyPlanName = emergencyPlanName;
    }

    private String drillName;

    private String drillAddress;