micord/ervu-lkrp-ul
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source 
# Conflicts:
#	backend/pom.xml
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
This commit is contained in:
Zaripov Emil 2024-11-20 11:16:55 +03:00
commit 67214fccdc
11 changed files with 194 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

19
resources/src/main/resources/business-model/Информация об организации.page
View file

@ -288,7 +288,7 @@
<value>
<item id="7a2b1d18-0ea1-49c8-b6bf-5d91761ca0a0" removed="false">
<value>
<simple>"font-bold"</simple>
<simple>"subtitle"</simple>
</value>
</item>
</value>
@ -338,7 +338,7 @@
<value>
<item id="7a2b1d18-0ea1-49c8-b6bf-5d91761ca0a0" removed="false">
<value>
<simple>"font-bold"</simple>
<simple>"description"</simple>
</value>
</item>
</value>
@ -432,16 +432,7 @@
<name>HB</name>
<container>true</container>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
<scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
@ -610,7 +601,7 @@
<value>
<item id="ddf92f21-aac9-4378-b2e7-3884fa0b1164" removed="false">
<value>
<simple>"font-bold"</simple>
<simple>"subtitle"</simple>
</value>
</item>
</value>
@ -1161,7 +1152,7 @@
<value>
<item id="ddf92f21-aac9-4378-b2e7-3884fa0b1164" removed="false">
<value>
<simple>"font-bold"</simple>
<simple>"subtitle"</simple>
</value>
</item>
</value>