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

lyfO_o

2021-06-21 4d3856e802d5c9d28d8654f35da426bdb517d7d4

 src/main/java/com/nanometer/smartlab/entity/enumtype/Type.java

@@ -3,6 +3,7 @@
import java.util.HashMap;

public enum Type {
   //3为 危化品试剂
   REFUSE(0, "耗材"), PENDING_APPROVAL(1, "试剂");
   private int key;