Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/supervise

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: '仓库管控'
           },
           {

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("查询门店销售信息")
+    @ApiOperation("查询门店商品销售信息")
-    @PostMapping("/getAllStoreSalesReport")
+    @PostMapping("/getAllGoodsSalesReport")
     @ResponseBody
     public List<GoodsSalesReportExcelVo> getAllGoodsSalesReport(@RequestBody PagerQuery<GdSalesReportQuery> pq);
 
 
-    @ApiOperation("查询门店销售信息")
+    @ApiOperation("查询门店烟草销售信息")
-    @PostMapping("/getAllStoreSalesReport")
+    @PostMapping("/StoreSalesYcReportExcelVo")
     @ResponseBody
     public List<StoreSalesReportExcelVo>  StoreSalesYcReportExcelVo(@RequestBody PagerQuery<GdSalesReportQuery> pq);
 
 
-    @ApiOperation("查询门店销售信息")
+    @ApiOperation("查询门店烟草商品销售信息")
-    @PostMapping("/getAllStoreSalesReport")
+    @PostMapping("/GoodsSalesReportYcExcelVo")
     @ResponseBody
     public List<GoodsSalesReportExcelVo> GoodsSalesReportYcExcelVo(@RequestBody PagerQuery<GdSalesReportQuery> pq);
 }