fuxingfan
/
smartCommunity
Volgen 1
Ster 0
Vork 0
Code Kwesties 1 Pull-aanvragen 0 Publicaties 4 Activiteit
Bladeren bron

pdm

傅行帆 6 jaren geleden
bovenliggende
620d824831
commit
d93e3765d0
2 gewijzigde bestanden met toevoegingen van 0 en 77 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 0
    38
      文档/MYSQL/smartCommunity.pdb
  2. 0
    39
      文档/MYSQL/smartCommunity.pdm

+ 0
- 38
文档/MYSQL/smartCommunity.pdb Bestand weergeven 

@@ -1,43 +1,5 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 
-<<<<<<< HEAD
3 
-<<<<<<< HEAD
4 
-=======
5 
-<<<<<<< HEAD
6 
->>>>>>> 3e22d69e9d9a7749700731ff292c490d4b8ea27a
7 
-<<<<<<< HEAD
8 
-<<<<<<< HEAD
9 
-<<<<<<< HEAD
10 
-<<<<<<< HEAD
11 
-<<<<<<< HEAD
12 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540265676" Name="smartCommunity" Objects="588" Symbols="68" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
13 
-=======
14 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540286027" Name="smartCommunity" Objects="595" Symbols="69" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
15 
->>>>>>> develop
16 
-=======
17 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540363057" Name="smartCommunity" Objects="590" Symbols="69" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
18 
->>>>>>> develop
19 
-=======
20 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540429913" Name="smartCommunity" Objects="572" Symbols="68" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
21 
->>>>>>> develop
22 
-=======
23 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540980036" Name="smartCommunity" Objects="619" Symbols="74" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
24 
->>>>>>> develop
25 
-=======
26 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540980036" Name="smartCommunity" Objects="630" Symbols="74" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
27 
->>>>>>> 9184914905a8205c9b56c442097351a5d3289c9f
28 
-=======
29 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1541147405" Name="smartCommunity" Objects="634" Symbols="74" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
30 
->>>>>>> develop
31 
-=======
32 
-<<<<<<< HEAD
33 2 
 <?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542960175" Name="smartCommunity" Objects="686" Symbols="79" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
34 
-=======
35 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1541677855" Name="smartCommunity" Objects="655" Symbols="77" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
36 
->>>>>>> develop
37 
-=======
38 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542791427" Name="smartCommunity" Objects="656" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
39 
->>>>>>> 3e22d69e9d9a7749700731ff292c490d4b8ea27a
40 
->>>>>>> develop
41 3 
 <!-- do not edit this file -->
42 4
43 5 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">

+ 0
- 39
文档/MYSQL/smartCommunity.pdm Bestand weergeven 

@@ -1,44 +1,5 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 
-<<<<<<< HEAD
3 
-<<<<<<< HEAD
4 
-=======
5 
-<<<<<<< HEAD
6 
->>>>>>> 3e22d69e9d9a7749700731ff292c490d4b8ea27a
7 
-<<<<<<< HEAD
8 
-<<<<<<< HEAD
9 
-<<<<<<< HEAD
10 
-<<<<<<< HEAD
11 
-<<<<<<< HEAD
12 
-<<<<<<< HEAD
13 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540273523" Name="smartCommunity" Objects="577" Symbols="68" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
14 
-=======
15 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540286027" Name="smartCommunity" Objects="595" Symbols="69" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
16 
->>>>>>> develop
17 
-=======
18 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540363057" Name="smartCommunity" Objects="590" Symbols="69" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
19 
->>>>>>> develop
20 
-=======
21 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540456024" Name="smartCommunity" Objects="572" Symbols="68" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
22 
->>>>>>> develop
23 
-=======
24 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1541056830" Name="smartCommunity" Objects="619" Symbols="74" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
25 
->>>>>>> develop
26 
-=======
27 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540980036" Name="smartCommunity" Objects="630" Symbols="74" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
28 
->>>>>>> 9184914905a8205c9b56c442097351a5d3289c9f
29 
-=======
30 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1541147405" Name="smartCommunity" Objects="634" Symbols="74" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
31 
->>>>>>> develop
32 
-=======
33 
-<<<<<<< HEAD
34 2 
 <?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542960175" Name="smartCommunity" Objects="686" Symbols="79" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
35 
-=======
36 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1541677855" Name="smartCommunity" Objects="655" Symbols="77" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
37 
->>>>>>> develop
38 
-=======
39 
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542791427" Name="smartCommunity" Objects="656" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
40 
->>>>>>> 3e22d69e9d9a7749700731ff292c490d4b8ea27a
41 
->>>>>>> develop
42 3 
 <!-- do not edit this file -->
43 4
44 5 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">