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

src/main/java/com/kexun/service/field/BaseFieldPackageJsonService.java

@@ -94,7 +94,7 @@ public class BaseFieldPackageJsonService implements IBaseFieldPackageJsonService
                 map.putAll(prdDefinMap);
                 fieldJsonMap.put(jsonKey, map);
             } else {
-                subPrdJsonMap.put(jsonKey, infoMap);
+                subPrdJsonMap.put(jsonKey, prdDefinMap);
                 fieldJsonMap.putAll(subPrdJsonMap);
             }
             //节点类型是列表，需要统计各个字段，那么计算用同一个函数，一块进行计算，获取一个计算结果

src/main/java/com/kexun/service/xml/ParseHandleService.java

@@ -117,7 +117,6 @@ public class ParseHandleService {
                                 factoryBean.getSpecService().handleXmlSpec(commonParam, jsonBean, iBaseEntity);
                             }
                             //先查询,根据rpt_no查询是否存在
-
                             QueryWrapper queryWrapper = new QueryWrapper();
                             queryWrapper.eq("rpt_no", commonParam.getRptNo());
                             //根据rpt_no查询是否存在，如果存在则更新