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

czkh

2 天以前 975823f4d07c91a67162f553be9ff4ac25f3d47d

 src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java

@@ -56,6 +56,7 @@
            waitPakin1.setIoStatus("N");     // 入出状态
            waitPakin1.setAnfme(1.0);  // 数量
            waitPakin1.setStatus("Y");    // 状态
            waitPakin1.setModel(mat.getName());
            //waitPakin1.setAppeUser(waitPakin.getAppeUser());
            waitPakin1.setAppeTime(now);
            //waitPakin1.setModiUser(waitPakin.getAppeUser());