Merge remote-tracking branch 'origin/ah-simple-test' into ah-simple-test

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/domain/EquipmentType.java

@@ -77,4 +77,9 @@ public class EquipmentType {
      * 是否叶子节点
      */
     private Boolean leaf;
+
+    /**
+     * 删除标志（0代表存在 2代表删除），默认值0
+     */
+    private String delFlag = "0";
 }

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentTypeMapper.xml

@@ -58,7 +58,7 @@
     <select id="selectAllEquipmentTypes" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List" />
         FROM ma_type
-        WHERE level != '7'
+        WHERE level != '7' and del_flag = '0'
     </select>
 
     <select id="selectEquipmentTypeById" resultMap="BaseResultMap">