Merge remote-tracking branch 'origin/master'

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java

@@ -96,7 +96,7 @@ public class BusinessFileController extends BaseController {
 
             // 上传并返回文件全路径
             String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+//            String url = serverConfig.getUrl() + fileName;
             AjaxResult ajax = AjaxResult.success();
             ajax.put("url", fileName);
             return ajax;

dsk-operate-ui/src/assets/styles/index.scss

@@ -387,21 +387,13 @@ ul, li {
 }
 
 .common-title{
+  border-left: 2px solid #445781;
+  padding-left: 8px;
   font-size: 16px;
-  color: #232323;
+  height: 16px;
+  line-height: 16px;
   font-weight: 700;
-  line-height: 0.9;
-  position: relative;
-  padding: 0 0 0 8px;
-  &:before{
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 2px;
-    height: 14px;
-    background: #445781;
-    content:"";
-  }
+  color: #232323;
 }
 
 .pagination-box{

dsk-operate-ui/src/layout/components/TagsView/index.vue

@@ -355,9 +355,9 @@ export default {
       transition: all .3s cubic-bezier(.645, .045, .355, 1);
       transform-origin: 100% 50%;
       &:before {
-        transform: scale(.6);
+        transform: scale(.95);
         display: inline-block;
-        vertical-align: -3px;
+        vertical-align: -2.5px;
       }
     }
   }

dsk-system/src/main/java/com/dsk/system/domain/customer/vo/CustomerFollowRecordListVo.java

@@ -2,6 +2,7 @@ package com.dsk.system.domain.customer.vo;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -57,6 +58,7 @@ public class CustomerFollowRecordListVo implements Serializable {
     private String content;
 
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessContactsServiceImpl.java

@@ -65,7 +65,7 @@ public class BusinessContactsServiceImpl implements IBusinessContactsService
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if (ObjectUtil.isEmpty(loginUser)) throw new BaseException("请登录");
         //维护人员为当前登录用户
-        businessContacts.setAccendant(loginUser.getUsername());
+        businessContacts.setAccendant(loginUser.getUser().getNickName());
         return businessContactsMapper.insertBusinessContacts(businessContacts);
     }
 

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

@@ -148,7 +148,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
             row++;
             if (count > 0) {
                 //如果存在，跳过该项目，不保存
-                result.add("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目，保存下一条");
+//                result.add("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目，保存下一条");
+                log.info("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目，保存下一条");
                 errorCount++;
             } else {
                 //保存到数据库