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

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -914,7 +914,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             times++;
         }
         for (int i = 1; i <= times; i++) {
-            map.put("number", i);
+            map.put("number", 1);
             map.put("size", 1000);
             Page<Map<String, Object>> page = getAll(map);
             saveBatchEquipment2Es(page.getRecords());