micord/ervu-lkrp-fl
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-12-23 10:18:23 +03:00
commit f96d81f660
9 changed files with 36 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

48
resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page
View file

@ -2220,13 +2220,6 @@
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<children id="bdffd190-e62e-446b-aaa2-fb3f5e170af6">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>bdffd190-e62e-446b-aaa2-fb3f5e170af6</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="3a7fedf0-a3ac-4b84-bb4e-c87eb353240d">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
@ -2358,22 +2351,7 @@
<entry>
<key>formatters</key>
<value>
<item id="82cf4f0a-6b46-4741-b567-09a3048c9d8c" removed="false">
<value>
<complex>
<entry>
<key>format</key>
<value>
<simple>"dd.MM.yyyy"</simple>
</value>
</entry>
</complex>
<implRef type="JAVA">
<className>LocalDateFormatter</className>
<packageName>ru.micord.ervu.component.formatter</packageName>
</implRef>
</value>
</item>
<item id="82cf4f0a-6b46-4741-b567-09a3048c9d8c" removed="true"/>
<item id="20087965-0ef5-4212-8806-dc7f0bff369d" removed="true"/>
</value>
</entry>
@ -2549,13 +2527,6 @@
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<children id="ab01ad21-ea41-413e-a1b1-bbd54ed8d959">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>ab01ad21-ea41-413e-a1b1-bbd54ed8d959</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="4e886a36-f027-4fc0-a0d5-0e934efdc726">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
@ -2712,22 +2683,7 @@
<entry>
<key>formatters</key>
<value>
<item id="5089c84e-5251-49e1-a96f-0cac1b83c800" removed="false">
<value>
<complex>
<entry>
<key>format</key>
<value>
<simple>"dd.MM.yyyy"</simple>
</value>
</entry>
</complex>
<implRef type="JAVA">
<className>LocalDateFormatter</className>
<packageName>ru.micord.ervu.component.formatter</packageName>
</implRef>
</value>
</item>
<item id="5089c84e-5251-49e1-a96f-0cac1b83c800" removed="true"/>
<item id="2e26d6be-82e8-40ca-93db-29914b1ad4c8" removed="true"/>
</value>
</entry>