Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html

ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java

@@ -74,6 +74,7 @@ public class ReportDataController extends BaseController {
         }
         String info = JSONArray.toJSONString(list);
 //        System.out.println(info);
+        System.out.println("条码信息查询Json格式："+info);
         return info;
     }
 }