Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

2 天以前 80c45ea7934443bea5355bc6bace96ec23a58600

 src/main/java/com/ruoyi/basic/pojo/Customer.java

@@ -31,6 +31,10 @@
     */
    @Excel(name = "客户名称")
    private String customerName;
    /** 客户分类：零售客户，进销商客户 */

    @Excel(name = "客户分类")
    private String customerType;

    /**
     * 纳税人识别号