Merge branch 'master' into feature/v2.4.28

src/views/order/components/bigOrderEdit.vue

@@ -415,8 +415,7 @@
                   @levelChange="channelChange" v-if="bShow"></v-cascader>
               </FormItem>
             </div>
-            <!-- 修改为默认展示 -->
-            <div v-show="!showOrderOther">
+            <div>
               <FormItem label="订单备注">
                 <Input v-model="member.remark" type="text" :maxlength="40" placeholder="请输入订单备注"></Input>
               </FormItem>