Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

6 天以前 66c6ab9883ecb5e0595f02fec6b66e962d1fbf67

 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;