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

imcs-admin-boot/imcs-tenant-biz/src/main/resources/mapper_tenant/base/defaults/ProductionresourceviewMapper.xml

@@ -121,7 +121,8 @@
         LEFT JOIN (
         SELECT
         zp.resource_id,
-        z. NAME zoneName,
+        z.id zoneId,
+        z.NAME zoneName,
         z.org_id
         FROM
         imcs_z_zone z