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

lty

昨天 8fe628e31d57f10f83b0c7b73aa4506e8d888c48

 src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java

@@ -79,4 +79,8 @@
    List<ManLocDetl> listByOutPage(Map<String, Object> condition);

    long listByOutPageCount(Map<String, Object> condition);

    List<ManLocDetl> selectAllPage(Map<String, Object> condition);

    long selectAllPageSize(Map<String, Object> condition);
}