diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ba126cc..a3a2157 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,22 @@ - - - - - - - + + + + + + + + + + + + + + + + @@ -136,46 +147,46 @@ - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class index 2027c8c..cfdaf3d 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class differ diff --git a/ruoyi-admin/target/maven-archiver/pom.properties b/ruoyi-admin/target/maven-archiver/pom.properties index 5d9f12d..7704d64 100644 --- a/ruoyi-admin/target/maven-archiver/pom.properties +++ b/ruoyi-admin/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 15:34:59 CST 2024 +#Mon Aug 12 08:02:54 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-admin diff --git a/ruoyi-admin/target/ruoyi-admin.jar b/ruoyi-admin/target/ruoyi-admin.jar index b6ac37f..ffd261d 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar and b/ruoyi-admin/target/ruoyi-admin.jar differ diff --git a/ruoyi-admin/target/ruoyi-admin.jar.original b/ruoyi-admin/target/ruoyi-admin.jar.original index 2086716..171d14f 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar.original and b/ruoyi-admin/target/ruoyi-admin.jar.original differ diff --git a/ruoyi-common/target/maven-archiver/pom.properties b/ruoyi-common/target/maven-archiver/pom.properties index 7908d5c..c58b26f 100644 --- a/ruoyi-common/target/maven-archiver/pom.properties +++ b/ruoyi-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 15:34:09 CST 2024 +#Mon Aug 12 08:02:41 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-common diff --git a/ruoyi-common/target/ruoyi-common-3.8.7.jar b/ruoyi-common/target/ruoyi-common-3.8.7.jar index 393b86a..e02cc2e 100644 Binary files a/ruoyi-common/target/ruoyi-common-3.8.7.jar and b/ruoyi-common/target/ruoyi-common-3.8.7.jar differ diff --git a/ruoyi-framework/target/maven-archiver/pom.properties b/ruoyi-framework/target/maven-archiver/pom.properties index 62bb4f7..3b3ce5c 100644 --- a/ruoyi-framework/target/maven-archiver/pom.properties +++ b/ruoyi-framework/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 15:34:31 CST 2024 +#Mon Aug 12 08:02:48 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-framework diff --git a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar index db93e24..6b496b3 100644 Binary files a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar and b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar differ diff --git a/ruoyi-generator/target/maven-archiver/pom.properties b/ruoyi-generator/target/maven-archiver/pom.properties index d1a568f..9851f5e 100644 --- a/ruoyi-generator/target/maven-archiver/pom.properties +++ b/ruoyi-generator/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 15:34:43 CST 2024 +#Mon Aug 12 08:02:49 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-generator diff --git a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar index b4363c6..232a10c 100644 Binary files a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar and b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar differ diff --git a/ruoyi-quartz/target/maven-archiver/pom.properties b/ruoyi-quartz/target/maven-archiver/pom.properties index 7c73da2..4918088 100644 --- a/ruoyi-quartz/target/maven-archiver/pom.properties +++ b/ruoyi-quartz/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 15:34:37 CST 2024 +#Mon Aug 12 08:02:49 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-quartz diff --git a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar index e0d749f..49895bd 100644 Binary files a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar and b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar differ diff --git a/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class b/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class index 66144be..84167af 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class and b/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class differ diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index 55ca070..5dd20ea 100644 --- a/ruoyi-system/target/maven-archiver/pom.properties +++ b/ruoyi-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Aug 09 15:34:17 CST 2024 +#Mon Aug 12 08:02:44 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-system diff --git a/ruoyi-system/target/ruoyi-system-3.8.7.jar b/ruoyi-system/target/ruoyi-system-3.8.7.jar index 23a893f..280f845 100644 Binary files a/ruoyi-system/target/ruoyi-system-3.8.7.jar and b/ruoyi-system/target/ruoyi-system-3.8.7.jar differ diff --git a/ruoyi-ui/src/views/bid/bid/index.vue b/ruoyi-ui/src/views/bid/bid/index.vue index 057b130..a7ea174 100644 --- a/ruoyi-ui/src/views/bid/bid/index.vue +++ b/ruoyi-ui/src/views/bid/bid/index.vue @@ -1168,10 +1168,10 @@ - {{item.bidPriceAdjustmentNotice}} {{item.bidTongPrice}} {{item.bidLvPrice}} + {{item.bidMatpriceDiff}} {{item.bidFactoryPrice}} {{item.bidPrice}} @@ -1853,7 +1853,7 @@ export default { ).label; }); - this.bidHistoryList = response.data + this.bidHistoryList = bidHistoryList }); },