psemenkov 1adfb2f7a7 Merge remote-tracking branch 'origin/dev' into imdg_refactoring ... # Conflicts: # clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java # clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserConnect.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/IMDGApplication.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RelationMapStore.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserConnectMapStore.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java		2022-10-11 12:28:55 +03:00
..
java/ru/spcex/clearing/backendapi	Merge remote-tracking branch 'origin/dev' into imdg_refactoring	2022-10-11 12:28:55 +03:00
resources	DDL, meta обновление 04.10.2022, http://jira.mfd.msk:8088/browse/CLS-47 http://jira.mfd.msk:8088/browse/CLS-58	2022-10-04 13:29:14 +03:00
web/WEB-INF	add storage module	2022-07-25 12:14:18 +03:00