Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '开滦集团报送系统',
+      title: '开滦采集转换系统',
       logo: logoImg
     }
   }

ruoyi-ui/src/settings.js

 module.exports = {
-  title: '开滦集团报送系统',
+  title: '开滦采集转换系统',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

ruoyi-ui/src/views/login.vue

@@ -5,7 +5,7 @@
       <span class="text">开滦（集团）有限责任公司</span>
     </div>
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">开滦集团报送系统</h3>
+      <h3 class="title">开滦采集转换系统</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

ruoyi-ui/src/views/system/supplies/index.vue

 <template>
     <div class="app-container">
-        <el-form  ref="queryForm" size="small" :inline="true"  label-width="68px">
+        <el-form  ref="queryForm" size="small" :inline="true"   label-width="68px">
             <el-form-item label="模板" prop="name" >
                 <el-select v-model="selectedOption" ref="mySelect" size="mini" @change="handleOptionChange" filterable placeholder="请选择您要查看的模板">
                     <!--  <el-option label="自设的模板名" value="使用空白模板"></el-option>-->