Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -33,7 +33,7 @@
                         <el-dropdown-item divided  command="en">English</el-dropdown-item>
                     </el-dropdown-menu> 
                 </el-dropdown> -->
-                <div style="margin-right: 10px;" @click="applicationMarket">
+                <div style="margin-right: 10px;cursor: pointer;" @click="applicationMarket">
                     <i class="el-icon-menu" style="font-size:18px" ></i>
                     应用市场
                 </div>

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -127,7 +127,7 @@
                   </span>
                 </el-select>
 
-                <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'150'" :distinction="'5'"
+                <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'150'" :distinction="'5'" :disabled="expenseMainTypeValue == 14454"
                   :subject="usersNoInfo" :subjectId="addForm.secondCheckerId" ref="selectCat" 
                   @selectCal="selectCal"></selectCat>
               </el-form-item>

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/appMarket.html

@@ -13,10 +13,10 @@
   <div class="applicationMarket">
     <div class="applicationMarket-title">
       <div class="ourServices">
-        我们的服务
+        应用市场
       </div>
       <div class="applicationEncyclopedia">
-        权威认证--火石智能引擎，一站式攻克管理难题
+        为您提供全面的数字化解决方案
       </div>
     </div>
     <div class="topicContent">

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/appMarket.html

@@ -13,10 +13,10 @@
   <div class="applicationMarket">
     <div class="applicationMarket-title">
       <div class="ourServices">
-        我们的服务
+        应用市场
       </div>
       <div class="applicationEncyclopedia">
-        权威认证--火石智能引擎，一站式攻克管理难题
+        为您提供全面的数字化解决方案
       </div>
     </div>
     <div class="topicContent">