fuxingfan
/
smartCommunity
Watch 1
Star 0
Fork 0
Code Issues 1 Pull Requests 0 Releases 4 Activity
Browse Source

Merge branch 'master' of http://git.ycjcjy.com/fuxingfan/smartCommunity 

# Conflicts:
#	文档/MYSQL/smartCommunity.pdb
#	文档/MYSQL/smartCommunity.pdm
傅行帆 6 years ago
parent
5a52b11bca 9184914905
commit
c19c0cc23b
2 changed files with 10 additions and 3 deletions
Split View Show Diff Stats
  1. 3
    0
      文档/MYSQL/smartCommunity.pdb
  2. 7
    3
      文档/MYSQL/smartCommunity.pdm

+ 3
- 0
文档/MYSQL/smartCommunity.pdb View File 

@@ -16,6 +16,9 @@
16 16 
 =======
17 17 
 <?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"?>
18 18 
 >>>>>>> develop
19 
+=======
20 
+<?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"?>
21 
+>>>>>>> 9184914905a8205c9b56c442097351a5d3289c9f
19 22 
 <!-- do not edit this file -->
20 23
21 24 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">

+ 7
- 3
文档/MYSQL/smartCommunity.pdm View File 

@@ -3,6 +3,7 @@
3 3 
 <<<<<<< HEAD
4 4 
 <<<<<<< HEAD
5 5 
 <<<<<<< HEAD
6 
+<<<<<<< HEAD
6 7 
 <?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"?>
7 8 
 =======
8 9 
 <?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,6 +17,9 @@
16 17 
 =======
17 18 
 <?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"?>
18 19 
 >>>>>>> develop
20 
+=======
21 
+<?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"?>
22 
+>>>>>>> 9184914905a8205c9b56c442097351a5d3289c9f
19 23 
 <!-- do not edit this file -->
20 24
21 25 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
 
@@ -8717,11 +8721,11 @@ LABL 0 新宋体,8,N</a:FontList>
8717 8721 
 </o:Column>
8718 8722 
 <o:Column Id="o353">
8719 8723 
 <a:ObjectID>1BD09378-9767-42AE-9653-B5AA31C11822</a:ObjectID>
8720 
-<a:Name>registration_end_time</a:Name>
8721 
-<a:Code>registration_end_time</a:Code>
8724 
+<a:Name>registration_end_time2</a:Name>
8725 
+<a:Code>registration_end_time2</a:Code>
8722 8726 
 <a:CreationDate>1539760549</a:CreationDate>
8723 8727 
 <a:Creator>szc</a:Creator>
8724 
-<a:ModificationDate>1540273523</a:ModificationDate>
8728 
+<a:ModificationDate>1539760648</a:ModificationDate>
8725 8729 
 <a:Modifier>szc</a:Modifier>
8726 8730 
 <a:Comment>报名结束时间</a:Comment>
8727 8731 
 <a:DataType>datetime</a:DataType>