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

nafmii-common/src/main/java/org/nafmii/constant/BusinessEnum.java

+package org.nafmii.constant;
+
+/**
+ * @author lvyp
+ * @date 2021/4/25
+ */
+public enum BusinessEnum {
+    APP_CONF_CAROUSE_PIC("1","轮播图"),
+    APP_CONF_OPENSCREEN_PIC("2","开屏图"),
+    APP_CONF_ICON("3","首页ICON");
+
+    private String businessType;
+    private String businessName;
+
+    BusinessEnum(String businessType, String businessName) {
+        this.businessType = businessType;
+        this.businessName = businessName;
+    }
+
+    BusinessEnum() {
+    }
+
+    public String getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(String businessType) {
+        this.businessType = businessType;
+    }
+
+    public String getBusinessName() {
+        return businessName;
+    }
+
+    public void setBusinessName(String businessName) {
+        this.businessName = businessName;
+    }
+}

nafmii-common/src/main/java/org/nafmii/constant/CommonEnum.java

+package org.nafmii.constant;
+
+public enum CommonEnum {
+
+    /**
+     * 通用枚举
+     */
+    DELETE("1", "删除"),
+    USED("0", "在用"),
+    DISABLE("1", "停用"),
+    ENABLE("0", "启用"),
+
+    /**
+     * 排序
+     */
+    ORDER_BY_ASC("ASC", "正序"),
+    ORDER_BY_DESC("DESC", "倒序"),
+    ;
+
+
+    CommonEnum(String code, String name){
+        this.code = code;
+        this.name = name;
+    }
+
+    private String name;
+    private String code;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}