Merge remote-tracking branch 'origin/master' into prod_test

src/main/java/cn/cslg/pas/service/business/es/EsCustomFieldService.java

@@ -657,7 +657,7 @@ public class EsCustomFieldService {
         List<InnerFields> innerFields = esQueryPatentFieldsDTO.getInnerFields();
 
         if(innerFields.size()==0){
-            return ;
+            return esPatentFieldsVOS;
         }
         for (String patentNo : patentNos) {
             EsPatentFieldsVO esPatentFieldsVO = new EsPatentFieldsVO();