字段名修改，枚举修改提交

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelDto.java

@@ -22,7 +22,7 @@ public class JgScrapCancelDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "注销类型（1报废注销，2移装注销）")
-    private String type;
+    private String cancelType;
 
     @ApiModelProperty(value = "申请编号")
     private String applyNo;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java

@@ -25,8 +25,8 @@ public class JgScrapCancel extends BaseEntity {
     /**
      * 注销类型（1报废注销，2移装注销）
      */
-	@TableField("type")
-    private String type;
+	@TableField("cancel_type")
+    private String cancelType;
 
     /**
      * 申请编号

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CancelTypeEnum.java

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+/**
+ * 办理状态枚举
+ */
+public enum CancelTypeEnum {
+
+    /**
+     * 报废注销
+     */
+    SCRAPPED("1", "报废注销"),
+    /**
+     * 移装注销
+     */
+    TRANSFER("2", "移装注销");
+
+    private final String code;
+
+    private final String name;
+
+    CancelTypeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getNameByType(String code) {
+        String name = null;
+        for (CancelTypeEnum enumOne : CancelTypeEnum.values()) {
+            if (enumOne.getCode() == code) {
+                name = enumOne.getName();
+                break;
+            }
+        }
+        return name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -26,6 +26,7 @@ public enum ApplicationFormTypeEnum {
     DWBG("DWBG"),//单位变更登记
     JY("JY"),
     JG("JG"),// 检验结果
+    SBZX("SBZX"),//电梯（设备）注销
     ;
 
     /**