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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -10,6 +10,43 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @Modify:
  **/
 public class MesEnumUtil {
+
+    /**
+     * 质量状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PASS_FAIL{
+
+        PASS(1,"合格"),
+        FAIL(2,"不合格");
+
+        private int value;
+        private String description;
+
+        PASS_FAIL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     /**
      * MesMethod实体对应的methodType值
      * 10.

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 
 @Data
 public class ButtonBean implements Serializable {
-    @ApiParam(value = "按钮名称")
+    @ApiParam(value = "按钮代码")
     private String buttonCode;
 
     @ApiParam(value = "按钮名称")