Merge branch 'dev-szl' into 'dev'

Dev szl

See merge request !42

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/MovementRecordsMasterController.java

@@ -778,12 +778,13 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
      *
      * @param id 动静态几何尺寸数据id
      * @param type 查询类型
+     * @param overType 轨检车->超限查询子类型
      * @return
      */
     @AutoLog(value = "轨检车详情查询")
     @ApiOperation(value = "轨检车详情查询", notes = "轨检车详情查询")
     @GetMapping(value = "/getTrackInfo")
-    public Result<Map<String, Object>> getTrackInfo(@ApiParam(name = "动静态几何尺寸数据id") String id, @ApiParam(name = "查询类型") String type,@ApiParam(name = "超限类型") String overType) {
+    public Result<Map<String, Object>> getTrackInfo(@ApiParam(name = "动静态几何尺寸数据id") String id, @ApiParam(name = "查询类型") String type,@ApiParam(name = "轨检车->超限查询子类型") String overType) {
         Map<String, Object> map = new HashMap<>();
         if ("1".equals(type)) {
             //轨检车-》轨道动态几何尺寸容许值差管理值