Merge branch 'ww' into test

src/main/resources/mapper/TbActivateProductMapper.xml

@@ -59,12 +59,11 @@ id, activate_id, product_id, num, create_time, update_time  </sql>
     </select>
 
     <select id="queryProsByActivateId" resultType="java.lang.String">
-        select
-            CONCAT(tb_product.name, '*', SUM(tb_activate_product.num))
+        select CONCAT(tb_product.name, '*', SUM(tb_activate_product.num))
         from tb_activate_product
                  LEFT JOIN tb_product ON tb_activate_product.product_id = tb_product.id
-        where
-            activate_id = #{activateId}
+        where activate_id = #{activateId}
+        group by tb_activate_product.product_id
     </select>