Merge branch 'dev' into test

src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java

@@ -56,7 +56,7 @@ public class PurOrderServiceImpl implements PurOrderService {
 
     @Override
     public List<PurOrderEntity> findByStatus(String billType, Integer status, Date lastUpdateTime) {
-        return purOrderDao.selectList(new QueryWrapper<PurOrderEntity>().eq("billType", billType).eq("status", status).gt("updateTime", lastUpdateTime));
+        return purOrderDao.selectList(new QueryWrapper<PurOrderEntity>().eq("billType", billType).eq("status", status).le(lastUpdateTime != null, "updateTime", lastUpdateTime));
     }
 
     @Override