Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!749

mp-service/src/main/resources/mapper/user/UserPrizeStorageMapper.xml

@@ -25,7 +25,7 @@
     </sql>
 
     <select id="listByQueryWrapper" resultType="com.qs.mp.user.domain.vo.UserPrizeStorageVO">
-        select t1.*, t2.sku_prop ,IF(t2.sku_prop is null, 0, 1) isMoreSku
+        select t1.*, t2.multi_sku isMoreSku
         from mp_user_prize_storage t1
          left join mp_goods t2 on t1.goods_id = t2.goods_id
         ${ew.customSqlSegment}