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

liding

3 天以前 1d915922d8197aa5d5dc3e40e3088d983dd6e141

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

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

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

    /**
     * 纳税人识别号