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

LSH

2022-08-17 27f0c5253fb48dbf9635d31c62d3435407f326c1

 src/main/resources/mapper/LocMastMapper.xml

@@ -48,7 +48,7 @@
        <if test="locType1 != null">
            and loc_type1 = #{locType1}
        </if>
        order by loc_sts desc ,lev1 asc,bay1 asc
        order by lev1 asc,bay1 asc
    </select>

    <select id="queryShallowLocFMast" resultMap="BaseResultMap">