Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -449,6 +449,9 @@
         <if test="skuName != null">
             AND tmgs.sku_name LIKE concat('%',my_ex.likequery(#{skuName}),'%')
         </if>
+        <if test="brandId != null">
+            AND tmgs.brand_id  = #{brandId} ::uuid
+        </if>
     </select>
 
     <!-- 获取商品个数 -->