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

mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -584,7 +584,7 @@
         <where>
             g.status_ != 0
             AND g.type_ = 'INSTRUMENT'
-            AND gc.del_flag_ = 0 and g.tenant_id_ = #{tenantId}
+            AND g.del_flag_ = 0 and g.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(#{organId},g.replacement_show_organ_id_)
             </if>