Merge remote-tracking branch 'origin/dev-2.20.0' into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/mapper/mapping/KcswDefaultMapper.xml

@@ -133,6 +133,7 @@
 
     <select id="getJyxxDetail" resultType="com.unis.reserveLayout.modular.dataKcglKcswDefault.entity.VO.CrkJyxxDataVO">
         SELECT
+				xz_enum.enumname as "lsxzName",
         a.lsxz AS "lsxz",
         b_2.enumName as "lspzName",
         a.lspz AS "lspz",
@@ -157,6 +158,7 @@
     LEFT JOIN basic_enum b_5 ON b.jyjg = b_5.enumId
     LEFT JOIN basic_enum b_6 ON b.lsdj = b_6.enumId
     LEFT JOIN basic_enum mxpz_enum ON mxpz_enum.enumId = a.mxpz
+		LEFT JOIN basic_enum xz_enum on xz_enum.enumId = a.lsxz
     where b.DataID = #{dataId}
     </select>
     <select id="getJyxxMxDetail" resultType="com.unis.reserveLayout.modular.dataKcglKcswDefault.entity.VO.CrkJyxxMxDataVO">