Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/bo/EnterpriseProjectImportantListDto.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 @ToString
@@ -20,6 +21,6 @@ public class EnterpriseProjectImportantListDto extends BasePage {
 
     private String projectLevel;
 
-    private String projectType;
+    private List<String> projectType;
 
 }

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

@@ -232,7 +232,7 @@ ul, li {
     }
   }
   .el-input__inner::placeholder{
-    color: rgba(35,35,35,0.4) !important;
+    color: rgba(35,35,35,0.8) !important;
   }
   .el-select .el-input .el-select__caret{
     color: #232323;
@@ -631,7 +631,7 @@ ul, li {
     line-height: 32px;
   }
   &:hover{
-    color: #fff;
+    color: #006AD1;
     border-color: #006AD1;
   }
 }

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -613,7 +613,7 @@ export default {
 
           & > span {
             color: #232323;
-            color: rgba(35, 35, 35, 0.4);
+            color: rgba(35, 35, 35, 0.8);
             font-weight: 400;
             margin-left: 8px;
             line-height: 22px;