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

buhuazhen

7 天以前 c449e0d7e5e537cd8dfb5928572db31d0310bc0e

 src/main/java/com/ruoyi/sales/dto/CustomerInteractionDto.java

@@ -17,6 +17,12 @@
    /** 应收金额 */
    private BigDecimal unReceiptAmount;

    /** 销售合同号 */
    private String salesContractNo;

    /** 采购合同号 */
    private String purchaseContractNo;

    /** 发生日期 */
    private LocalDate happenTime;