Merge branch 'test_warehouse' into test

101captain

2021-10-15 9bfe692752f1dc1a2a0c0c825a88335de30b92f6

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopFundsDTO.java

@@ -1,13 +1,11 @@
package com.panzhihua.common.model.dtos.shop;

import java.math.BigDecimal;

import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.NumberFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.Date;
import lombok.Data;

/**
 * @description: 商城订单导出
@@ -32,6 +30,5 @@

    @ExcelProperty("收支类型")
    private String type;


}