修改标签接口

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisTagController.java

@@ -65,7 +65,7 @@ public class PowerAxisTagController {
         return new Result();
     }
 
-    @PostMapping("delete")
+    @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
     public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisTagEntity.java

@@ -6,7 +6,6 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
 
 /**
  * 动力主轴标签 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java

@@ -61,7 +61,7 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
 
         QueryWrapper<PowerAxisTagEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
-                .orderByAsc("STRUCT_LEVEL");
+                .orderByAsc("TAG_CATEGORY", "STRUCT_LEVEL");
 
         return wrapper;
     }