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

zxl

2025-07-11 e81eae6c8446bbd91c162b5ef3e42051b5523bf1

 manager/src/views/goods/goods-info/goods.vue

@@ -216,6 +216,8 @@
              return h("Tag", { props: { color: "orange" } }, "零售");
            } else if (params.row.salesModel === "WHOLESALE") {
              return h("Tag", { props: { color: "magenta" } }, "批发");
            } else if (params.row.salesModel === "PRESALE") {
              return h("Tag", { props: { color: "magenta" } }, "预售");
            } else {
              return h("Tag", { props: { color: "volcano" } }, "其他类型");
            }