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

gongchunyi

5 天以前 a10faaa8d2a80f0302c35a5d73dcb7b3fb069133

 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;