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

zhang

8 天以前 5833f3f3aa5313fa1170cd9ab0c5857f964ba96c

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

@@ -10,8 +10,10 @@
    int getWorkingMast(Integer devpNo);

    List<WrkMast> selectToBeCompleteData();
    List<WrkMast> selectToBeCompleteData202();

    List<WrkMast> selectToBeHistoryData();
    List<WrkMast> selectToBeHistoryData2();

    WrkMast selectByBarcode(String barcode);