Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3

# Conflicts:
#	hzims-service/hzims-big-model/src/main/resources/template/template.yml

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolTypeServiceImpl.java

@@ -144,6 +144,9 @@ public class SafetyToolTypeServiceImpl extends ServiceImpl<SafetyToolTypeMapper,
 		IPage<SafetyToolTypeEntity> safetyToolTypePages = super.page(Condition.getPage(query), queryWrapper);
 		IPage<SafetyToolTypeVO> pages = new Page<>();
 		pages.setRecords(SafetyToolTypeWrapper.build().listVO(safetyToolTypePages.getRecords()));
+		pages.setTotal(safetyToolTypePages.getTotal());
+		pages.setCurrent(safetyToolTypePages.getCurrent());
+		pages.setSize(safetyToolTypePages.getSize());
 		return pages;
 	}