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

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java

@@ -79,7 +79,8 @@ public class MesProdShiftRecordServiceImpl implements IMesProdShiftRecordService
         DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", packBean);
         DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", packBean);
-        DdlPreparedPack.getStringEqualPack(item.getStartTime(), "startTime", packBean);
+//        DdlPreparedPack.getStringEqualPack(item.getStartTime(), "startTime", packBean);
+        DdlPreparedPack.getIsNull("endTime", packBean);
 
         MesProdShiftRecord mesProdShiftRecord = mesProdShiftRecordRDao.getByProperty(packBean);
         if (StringUtil.isEmpty(mesProdShiftRecord)) {