Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

tzsk

4 天以前 9b36259270078e99c7665a818fff90bbcde8ef7d

 src/main/java/com/zy/asrs/service/ManLocDetlService.java

@@ -60,7 +60,7 @@
    Page<ManLocDetl> getOutPage(Page<ManLocDetl> manLocDetlPage);


    void adjustLocDetl(LocDetlAdjustParam param, Long userId ,User user);
    void adjustLocDetl(LocDetlAdjustParam param, Long userId, String username);

    Page<ManLocDetl> selectAllPage(Page<ManLocDetl> param);