Browse Source

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

feature/address-coordinate
지대한 4 months ago
parent
commit
a29f18a2d6
  1. 1
      pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaModel.java
  2. 6
      pav-server/src/main/java/com/palnet/biz/api/external/model/ApprovalCd.java

1
pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaModel.java

@ -37,6 +37,7 @@ public class BasFlightPlanAreaModel {
private String updateUserId;
@Schema(hidden = true)
private Instant updateDt;
@Builder.Default
@Schema(hidden = true)
private String docState = "R";
private List<BasFlightPlanAreaCoordModel> coordList;

6
pav-server/src/main/java/com/palnet/biz/api/external/model/ApprovalCd.java vendored

@ -3,9 +3,9 @@ package com.palnet.biz.api.external.model;
import com.fasterxml.jackson.annotation.JsonCreator;
public enum ApprovalCd {
APPROVAL("A", "관제권내 허용고도"), // 승인
UNAPPROVED("U", "관제권내 제한고도"), // 미승인
UNTARGETED_AREA("O", "미대상 지역"); // 미대상
APPROVAL("S", "관제권내 허용고도"), // 승인
UNAPPROVED("F", "관제권내 제한고도"), // 미승인
UNTARGETED_AREA("U", "미대상 지역"); // 미대상
private final String code;
private final String message;

Loading…
Cancel
Save