Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractMessageServiceImpl.java

@@ -136,7 +136,7 @@ public class ContractMessageServiceImpl implements ContractMessageService {
     public void addByReturnMoney(ContractReturnMoney contractReturnMoney) {
         Contract contract = contractService.selectByPrimaryKey(contractReturnMoney.getContractId());
         BigDecimal amount = contractReturnMoney.getReturnAmount().setScale(2, RoundingMode.HALF_UP);
-        String content = "[回款]已回款：¥" + amount + " " + StringUtils.join(Arrays.asList(contract.getName(), contract.getContractOn(), "¥" + amount, contract.getAreaManager()), "/");
+        String content = "[回款]已回款：¥" + amount + " " + StringUtils.join(Arrays.asList(contract.getName(), contract.getContractOn(), "¥" + contract.getContractAmount(), contract.getAreaManager()), "/");
         ContractMessage message = null;
         if(StringUtils.isNotBlank(contractReturnMoney.getId())) {
             QueryWrapper<ContractMessage> queryWrapper = new QueryWrapper<>();