Browse Source

解决冲突

research/11.0

fly.li 3 years ago

parent

9d8b68ca72

commit

5714570bad

36 changed files with 0 additions and 0 deletions

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

1. BIN
     designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_1.png
2. BIN
     designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_10.png
3. BIN
     designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_11.png
4. BIN
     designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_12.png
5. BIN
     designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_13.png
6. BIN
     designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_14.png
7. BIN
     designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_15.png
8. BIN
     designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_16.png
9. BIN
     designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_17.png
10. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_18.png
11. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_2.png
12. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_3.png
13. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_4.png
14. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_5.png
15. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_6.png
16. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_7.png
17. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_8.png
18. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_9.png
19. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_1.png
20. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_10.png
21. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_11.png
22. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_12.png
23. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_13.png
24. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_14.png
25. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_15.png
26. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_16.png
27. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_17.png
28. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_18.png
29. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_2.png
30. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_3.png
31. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_4.png
32. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_5.png
33. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_6.png
34. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_7.png
35. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_8.png
36. BIN
      designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_9.png

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_1.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 36 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_10.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 45 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_11.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 51 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_12.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 56 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_13.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 47 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_14.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 44 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_15.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 37 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_16.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 53 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_17.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 38 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_18.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 44 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_2.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 30 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_3.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 33 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_4.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 32 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_5.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 42 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_6.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 31 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_7.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 33 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_8.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 39 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/real_style_9.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 33 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_1.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 5.4 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_10.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.9 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_11.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.0 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_12.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.5 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_13.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.9 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_14.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.0 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_15.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.4 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_16.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.3 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_17.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.1 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_18.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 10 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_2.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.1 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_3.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.2 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_4.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.7 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_5.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.9 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_6.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.7 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_7.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.9 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_8.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.4 KiB

BIN

designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_9.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.9 KiB

Write Preview

Loading…

Cancel

Save