Merge branch 'dev' into test

src/views/goods/class/index.vue

@@ -25,6 +25,14 @@
             <n-form-item-gi label="商品分类:" :span="14" path="name">
               <n-input v-model:value="model.name" placeholder="请输入商品分类" />
             </n-form-item-gi>
+            <n-form-item-gi label="商户序号:" :span="14" path="sort">
+              <n-input-number
+                v-model:value="model.sort"
+                placeholder="请输入商户排序序号"
+                :min="0"
+                :max="99999999"
+              />
+            </n-form-item-gi>
             <n-form-item-gi label="是否显示:" :span="14" path="status">
               <n-switch v-model:value="model.status" :unchecked-value="2" :checked-value="1" />
             </n-form-item-gi>
@@ -56,6 +64,7 @@ const showModalTitle = ref('')
 const model = ref({
   name: '',
   status: 2,
+  sort: 0,
 })
 
 const columns = ref([
@@ -162,6 +171,7 @@ const clear = () => {
   model.value = {
     name: '',
     status: 2,
+    sort: 0,
   }
   showModal.value = false
   get_data()