Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/login.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="loginView w-screen h-screen overflow-hidden flex">
-    <div class="w-96 bg-white m-auto border-t-8 border-blue-400 shadow-xl rounded-md pl-9 pr-9">
+    <div class="w-96 bg-white m-auto border-t-8 border-[#075985] shadow-xl rounded-md pl-9 pr-9">
       <div class="m-auto pt-4">
         <img class="w-1/5 h-1/5 m-auto" :src="loginLogo" alt="">
       </div>
@@ -24,10 +24,10 @@
         <img class="w-9 m-auto p-1 rounded-full border-blue-300 border-2 cursor-pointer" :src="qiyeweixin" alt="">
       </div>
       <div class="flex justify-between pb-5">
-        <div class="cursor-pointer text-blue-400 hover:text-blue-300">联系客服</div>
+        <el-link type="primary" :underline="false">联系客服</el-link>
         <div class="flex justify-around">
-          <div class="mr-4 cursor-pointer text-blue-400 hover:text-blue-300" @click="useHelp()">使用说明</div>
-          <div class="cursor-pointer text-blue-400 hover:text-blue-300" @click="toRegister()">企业注册</div>
+          <el-link class="mr-4" type="primary" :underline="false"  @click="useHelp()">使用说明</el-link>
+          <el-link type="primary" :underline="false" @click="toRegister()">企业注册</el-link>
         </div>
       </div>
       <el-dialog v-model="helpDialog" width="30%" title="使用说明">

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/BusinessOpportunity.java

@@ -148,6 +148,8 @@ public class BusinessOpportunity extends Model<BusinessOpportunity> {
     private String plate1;
     @TableField(exist = false)
     private String userId;
+    @TableField(exist = false)
+    private Integer productId;
 
     /**
      * 自定义字段存值

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -533,7 +533,7 @@
                 </el-option>
             </el-select>
 
-            <selectCat v-if="user.userNameNeedTranslate == 1" :size="'small'" :subject="users" :widthStr="350" :subjectId="moveReportUserId" :distinction="'22'" :clearable="true" @selectCal="selectCal"></selectCat>
+            <selectCat v-if="user.userNameNeedTranslate == 1" :filterable="true" :size="'small'" :subject="users" :widthStr="350" :subjectId="moveReportUserId" :distinction="'22'" :clearable="true" @selectCal="selectCal"></selectCat>
 
           </div>
         </div>