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

优化

See merge request quanshu/mp-server!932

mp-service/src/main/java/com/qs/mp/framework/service/impl/AsyncTaskServiceImpl.java

@@ -203,7 +203,7 @@ public class AsyncTaskServiceImpl extends ServiceImpl<AsyncTaskMapper, AsyncTask
         List<UserDeliverOrderItemCard> userDeliverOrderItemCardList = new ArrayList<>();
         for (UserDeliverOrderItem userDeliverOrderItem : userDeliverOrderItemList) {
             List<GoodsCard> goodsCardList = goodsCardService.list(new QueryWrapper<GoodsCard>()
-                .eq("goods", userDeliverOrderItem.getGoodsId())
+                .eq("goods_id", userDeliverOrderItem.getGoodsId())
                 .eq("is_use", 0)
                 .orderByAsc("rand()")
                 .last("limit " + userDeliverOrderItem.getGoodsNum()));