Merge remote-tracking branch 'origin/master'

enterprise-manager-ui/admin/src/components/Editor.vue

@@ -69,7 +69,7 @@ export default {
               [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
               [{ align: [] }], // 对齐方式
               ["clean"], // 清除文本格式
-              ["link", "image", "video"], // 链接、图片、视频
+              ["link", "image"], // 链接、图片
             ],
             handlers: {
               image: function (value) {

enterprise-manager-ui/admin/src/views/product/list.vue

@@ -131,6 +131,12 @@ export default {
             placeholder: "请选择产品分类",
             label: "产品分类",
           },
+          {
+            name: "shelves",
+            type: "select",
+            placeholder: "请选择上架状态",
+            label: "产品上架状态",
+          },
           {
             name: "companyId",
             type: "select",