Merge branch 'gyj' into test

eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbDeviceStockController.java

@@ -50,8 +50,8 @@ public class TbDeviceStockController {
             throw new RuntimeException("请先添加台桌");
         }
 
-        if (downloadDto.getCount() > (shopTables.size() * 2)) {
+        if (downloadDto.getCount() > 500) {
-            throw new RuntimeException("最多可获取台桌数量的2倍");
+            throw new RuntimeException("最多可获取500个");
         }
 
         TbDeviceStock lastRecord = tbDeviceStockService.findLastRecord();