数据库设计

fuintAdmin/src/views/convenienceStore/returns/details.vue

@@ -204,13 +204,6 @@
               <el-table-column label="单位" align="center" prop="unit"/>
             <el-table-column label="当前库存" align="center" prop="stock"/>
           </el-table>
-          <!-- <pagination
-             v-show="commodityForm.total>0"
-             :total="commodityForm.total"
-             :page.sync="commodityForm.page"
-             :limit.sync="commodityForm.pageSize"
-             @pagination="getCommodityList"
-            /> -->
         </el-main>
       </el-container>
       <div slot="footer" class="dialog-footer">
@@ -281,7 +274,6 @@ export default {
       // 供应商列表
       supplierList:[],
 
-
       state:'await',
 
       saveFlag:false,

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/controller/CardGiftActiveController.java

@@ -141,7 +141,7 @@ public class CardGiftActiveController extends BaseController {
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=demo.xlsx");
         try{
-            // 写入文件数据
+        // 写入文件数据
             response.setContentType("application/vnd.ms-excel");
             EasyExcel.write(response.getOutputStream(), CardGift.class).sheet("download").doWrite(list);
         }catch(Exception e) {