Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_beijing_auxiliary_YD into dev

src/main/java/com/yxproject/start/api/ReceiptApi.java

@@ -48,7 +48,7 @@ public class ReceiptApi {
         if ("长期".equals(expireDate)){
             expireDate="00000000";
         }
-        if(name.equals(null)|| beginDate.equals(null)|| id.equals(null)|| expireDate.equals(null)){
+        if((!beginDate.equals("") && expireDate.equals("")) || (!expireDate.equals("")&& beginDate.equals(""))){
             return null;
         }else {
             Map <String, Object> map=new HashMap <>();