Merge branch 'release-v4.14.0' into test

src/main/java/com/fdkankan/scene/service/ISceneMarkShapeService.java

@@ -30,6 +30,4 @@ public interface ISceneMarkShapeService extends IService<SceneMarkShape> {
     void editTrainStatus(SceneMarkShapeParamVO param);
 
     List<SceneMarkShape> findByNumAndType(String num,Integer type);
-
-    List<SceneMarkShape> findByNum(String num);
 }

src/main/java/com/fdkankan/scene/service/impl/SceneMarkShapeServiceImpl.java

@@ -192,11 +192,4 @@ public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, Scen
         wrapper.eq(SceneMarkShape::getType,type);
         return list(wrapper);
     }
-
-    @Override
-    public List<SceneMarkShape> findByNum(String num) {
-        LambdaQueryWrapper<SceneMarkShape> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(SceneMarkShape::getNum,num);
-        return list(wrapper);
-    }
 }