修复：图形验证码大写不识别

修复：按商户ID查询订单、商品、分类等

src/views/shop/goods/components/goodsEdit.vue

@@ -375,6 +375,7 @@
   import { listGoodsSpec } from "@/api/shop/goodsSpec";
   import { GoodsCategory } from "@/api/shop/goodsCategory/model";
   import { listGoodsCategory } from "@/api/shop/goodsCategory";
+  import { getMerchantId } from "@/utils/merchant";
 
   // 是否是修改
   const isUpdate = ref(false);
@@ -388,8 +389,6 @@
     visible: boolean;
     // 修改回显的数据
     data?: Goods | null;
-    // 商户ID
-    merchantId?: number;
   }>();
 
   const emit = defineEmits<{
@@ -418,6 +417,7 @@
   const goodsSpec = ref<GoodsSpec>();
   const category = ref<string[]>([]);
   const takeaway = ref<GoodsCategory[]>([]);
+  const merchantId = getMerchantId();
 
   const columns = [
     {