Merge branch 'master' of git.caimei365.com:git_lijun/caimei-mall-admin-ui

src/views/order/components/remarks.vue

@@ -10,7 +10,7 @@
       </div>
     </div>
     <div v-else class="info">
-      <p class="title">暂无信息,有需要请备注！</p>
+      <p class="title">暂无备注信息可供查看！</p>
     </div>
     <!--<el-form label-position="left" label-width="100px">
       <el-form-item label="备注" prop="remark">