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

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java

@@ -121,6 +121,9 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
                     JSONObject dataJson = JSONObject.parseObject(documentContent);
                     if(dataJson == null)
                         continue;
+                    String usage = dataJson.getString("usage");
+                    if(!"report".equals( usage) && ! "ingredient_report".equals(usage))
+                        continue;
                     if(dataJson.containsKey(field)){
                         if(!hasFields.contains( fieldName)){
                             fieldList.add(fieldDO);