Merge remote-tracking branch 'origin/developer' into developerD

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -1817,7 +1817,6 @@
         WHERE csl.delFlag = 0
           AND csr.delFlag = 0
           AND p.productID = #{productID}
-        group by p.productID
     </select>
     <select id="qualification" resultType="com.caimei.modules.product.entity.Product">
         SELECT qualificationNo, productName, qualificationTime, qualificationLink