Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreCartScrmMapper.java

@@ -85,7 +85,7 @@ public interface FsStoreCartScrmMapper
             "</if>" +
             "and c.user_id= #{uid} " +
             "</script>"})
-    List<FsStoreCartVO> selectFsStoreCartListByUid(long uid,@Param("config") MedicalMallConfig config);
+    List<FsStoreCartVO> selectFsStoreCartListByUid(@Param("uid") long uid,@Param("config") MedicalMallConfig config);
     @Delete({"<script>"+
             "delete from fs_store_cart_scrm where id in"+
            "<foreach collection='array' item='id' open='(' separator=',' close=')'>#{id}</foreach>"+