Merge branch 'dev_drug' of http://116.204.71.86:3000/UDI/udi-spms-java into dev_drug

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -411,7 +411,9 @@
 
     <select id="filterUdiGp" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
-        select basic_udirel.*,
+        select
+        IF ( (COUNT(DISTINCT IF(basic_products.bhltcjsl = 1,basic_products.bhsycjsl,0))-1) > 1,'多种包装规格',basic_products.bzgg) AS bzgg,
+        basic_udirel.*,
                bht.name             classifyName,
                basic_products.originUuid,
                basic_products.nameCode,
@@ -471,7 +473,6 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.bzgg,
                basic_products.id as productId,
                basic_products.categoryName,
                basic_products.catalogname1,