Merge remote-tracking branch 'origin/feature/SUPPORT-9339_add_sign_verify' into feature/SUPPORT-9368_journal_new_version

Browse source

# Conflicts:
#	backend/src/main/java/ru/micord/ervu/journal/JournalDto.java
#	backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java
#	backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java
#	resources/src/main/resources/business-model/Журнал взаимодействия.page

...

This commit is contained in:

adel.ka 2025-10-20 10:45:39 +03:00

parent 49385d5766 5b36227437

commit 1b0fb3e1bb

4 changed files with 5756 additions and 536 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6258

resources/src/main/resources/business-model/Личный кабинет юр лица.page

View file

File diff suppressed because it is too large Load diff