Merge branch 'master' into test

# Conflicts:
#	pro-base/src/main/java/com/idea/customerManagement/service/IntentionalDepositService.java

pro-base/src/main/java/com/idea/customerManagement/service/IntentionalDepositService.java

@@ -338,7 +338,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
 
         // 收款记录 修改一条记录
         PayLogExample payLogExample = new PayLogExample();
-        payLogExample.createCriteria().andBusinessIdEqualTo(model.getId()).andPayTypeEqualTo(7);
+        payLogExample.createCriteria().andBusinessIdEqualTo(model.getId()).andContentTypeEqualTo(7);
         List<PayLog> payLogs = payLogMapper.selectByExample(payLogExample);
         if(CollectionUtils.isNotEmpty(payLogs)){
             PayLog payLog = payLogs.get(0);