From 879267c38ffb5027f8576bf49c7665ba9b5d99cc Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 24 Apr 2023 10:52:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feign=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/api/gdsalesreport/GdSalesReportFeign.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GdSalesReportFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GdSalesReportFeign.java
index 4f3b663e..23e3c2ff 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GdSalesReportFeign.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GdSalesReportFeign.java
@@ -33,20 +33,20 @@ public interface GdSalesReportFeign {
     public List<StoreSalesReportExcelVo> getAllStoreSalesReport(@RequestBody PagerQuery<GdSalesReportQuery> pq);
 
 
-    @ApiOperation("查询门店销售信息")
-    @PostMapping("/getAllStoreSalesReport")
+    @ApiOperation("查询门店商品销售信息")
+    @PostMapping("/getAllGoodsSalesReport")
     @ResponseBody
     public List<GoodsSalesReportExcelVo> getAllGoodsSalesReport(@RequestBody PagerQuery<GdSalesReportQuery> pq);
 
 
-    @ApiOperation("查询门店销售信息")
-    @PostMapping("/getAllStoreSalesReport")
+    @ApiOperation("查询门店烟草销售信息")
+    @PostMapping("/StoreSalesYcReportExcelVo")
     @ResponseBody
     public List<StoreSalesReportExcelVo>  StoreSalesYcReportExcelVo(@RequestBody PagerQuery<GdSalesReportQuery> pq);
 
 
-    @ApiOperation("查询门店销售信息")
-    @PostMapping("/getAllStoreSalesReport")
+    @ApiOperation("查询门店烟草商品销售信息")
+    @PostMapping("/GoodsSalesReportYcExcelVo")
     @ResponseBody
     public List<GoodsSalesReportExcelVo> GoodsSalesReportYcExcelVo(@RequestBody PagerQuery<GdSalesReportQuery> pq);
 }

From 0d9e37e34a4457dea7aadd809111a70b1258320d Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 24 Apr 2023 14:16:59 +0800
Subject: [PATCH 2/2] 1111111

---
 yxt-portal-ui/src/assets/home/blcon10.png | Bin 0 -> 2450 bytes
 yxt-portal-ui/src/views/Home/Home.vue     |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 yxt-portal-ui/src/assets/home/blcon10.png

diff --git a/yxt-portal-ui/src/assets/home/blcon10.png b/yxt-portal-ui/src/assets/home/blcon10.png
new file mode 100644
index 0000000000000000000000000000000000000000..e438965391ed3c67d89f7c6d92aaf0d459ed46a8
GIT binary patch
literal 2450
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
Q?*IS*07*qoM6N<$f?AGsga7~l

literal 0
HcmV?d00001

diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue
index 1717f156..15389544 100644
--- a/yxt-portal-ui/src/views/Home/Home.vue
+++ b/yxt-portal-ui/src/views/Home/Home.vue
@@ -257,7 +257,7 @@
             title: '企业管理'
           },
           {
-            imgUrl: require('@/assets/home/bIcon9.png'),
+            imgUrl: require('@/assets/home/bIcon10.png'),
             title: '仓库管控'
           },
           {