Merge remote-tracking branch 'origin/康年堂' into 康年堂

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -1737,6 +1737,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--        <if test="maps.productName != null and  maps.productName !=  ''   ">-->
 <!--            group by o.id-->
 <!--        </if>-->
+        group by o.id
             order by
         <if test="maps.sortField == 'companyUserName'">
             cu.nick_name