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

liyong

7 天以前 936f4bd8b7837051ff63773be6d2d9c4b402b168

 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;