merge dapper and 0.1 into dapper
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<edmx:Edmx Version="3.0" xmlns:edmx="http://schemas.microsoft.com/ado/2009/11/edmx">
|
||||
<!-- EF Runtime content -->
|
||||
<edmx:Runtime>
|
||||
@@ -2615,6 +2615,7 @@
|
||||
<Property Name="pageSize" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
|
||||
<Property Name="printSize" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
|
||||
<Property Name="defaultStyle" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
|
||||
<Property Name="sort_order" Type="Int32" ConcurrencyMode="None" />
|
||||
</EntityType>
|
||||
<EntityType Name="actItem_files">
|
||||
<Key>
|
||||
@@ -5337,6 +5338,7 @@
|
||||
<EntitySetMapping Name="actItems">
|
||||
<EntityTypeMapping TypeName="Model.actItem">
|
||||
<MappingFragment StoreEntitySet="actItem">
|
||||
<ScalarProperty Name="sort_order" ColumnName="sort_order" />
|
||||
<ScalarProperty Name="defaultStyle" ColumnName="defaultStyle" />
|
||||
<ScalarProperty Name="printSize" ColumnName="printSize" />
|
||||
<ScalarProperty Name="pageSize" ColumnName="pageSize" />
|
||||
|
||||
Reference in New Issue
Block a user