# Conflicts:
#	performance-web/src/main/java/com/clx/performance/struct/loan/OwnerLoanAccountRunningWaterRecordStruct.java
#	performance-web/src/main/resources/bank/config-nbbank.json


Former-commit-id: c75aaa5b