Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
		
						commit
						ea336ebf21
					
				| 
						 | 
					@ -0,0 +1,8 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					--试车管理-系统资产导入
 | 
				
			||||||
 | 
					ALTER TABLE PreRun_PropertySysPiping
 | 
				
			||||||
 | 
					ALTER COLUMN PipingStart VARCHAR(500);
 | 
				
			||||||
 | 
					ALTER TABLE PreRun_PropertySysPiping
 | 
				
			||||||
 | 
					ALTER COLUMN PipingEnd VARCHAR(500);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19321,7 +19321,7 @@
 | 
				
			||||||
      </FlavorProperties>
 | 
					      </FlavorProperties>
 | 
				
			||||||
    </VisualStudio>
 | 
					    </VisualStudio>
 | 
				
			||||||
  </ProjectExtensions>
 | 
					  </ProjectExtensions>
 | 
				
			||||||
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
 | 
					  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
 | 
				
			||||||
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 | 
					  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 | 
				
			||||||
       Other similar extension points exist, see Microsoft.Common.targets.
 | 
					       Other similar extension points exist, see Microsoft.Common.targets.
 | 
				
			||||||
  <Target Name="BeforeBuild">
 | 
					  <Target Name="BeforeBuild">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -281357,7 +281357,7 @@ namespace Model
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipingStart", DbType="VarChar(50)")]
 | 
							[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipingStart", DbType="VarChar(500)")]
 | 
				
			||||||
		public string PipingStart
 | 
							public string PipingStart
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			get
 | 
								get
 | 
				
			||||||
| 
						 | 
					@ -281377,7 +281377,7 @@ namespace Model
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipingEnd", DbType="VarChar(50)")]
 | 
							[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipingEnd", DbType="VarChar(500)")]
 | 
				
			||||||
		public string PipingEnd
 | 
							public string PipingEnd
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			get
 | 
								get
 | 
				
			||||||
| 
						 | 
					@ -321220,7 +321220,7 @@ namespace Model
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDesrioption", DbType="NVarChar(200)")]
 | 
							[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDesrioption", DbType="NVarChar(2000)")]
 | 
				
			||||||
		public string ProblemDesrioption
 | 
							public string ProblemDesrioption
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			get
 | 
								get
 | 
				
			||||||
| 
						 | 
					@ -321240,7 +321240,7 @@ namespace Model
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TreatmentMeasures", DbType="NVarChar(200)")]
 | 
							[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TreatmentMeasures", DbType="NVarChar(2000)")]
 | 
				
			||||||
		public string TreatmentMeasures
 | 
							public string TreatmentMeasures
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			get
 | 
								get
 | 
				
			||||||
| 
						 | 
					@ -322202,7 +322202,7 @@ namespace Model
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDesrioption", DbType="NVarChar(200)")]
 | 
							[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDesrioption", DbType="NVarChar(2000)")]
 | 
				
			||||||
		public string ProblemDesrioption
 | 
							public string ProblemDesrioption
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			get
 | 
								get
 | 
				
			||||||
| 
						 | 
					@ -322222,7 +322222,7 @@ namespace Model
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TreatmentMeasures", DbType="NVarChar(200)")]
 | 
							[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TreatmentMeasures", DbType="NVarChar(2000)")]
 | 
				
			||||||
		public string TreatmentMeasures
 | 
							public string TreatmentMeasures
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			get
 | 
								get
 | 
				
			||||||
| 
						 | 
					@ -438616,7 +438616,7 @@ namespace Model
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDesrioption", DbType="NVarChar(200)")]
 | 
							[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDesrioption", DbType="NVarChar(2000)")]
 | 
				
			||||||
		public string ProblemDesrioption
 | 
							public string ProblemDesrioption
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			get
 | 
								get
 | 
				
			||||||
| 
						 | 
					@ -438632,7 +438632,7 @@ namespace Model
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TreatmentMeasures", DbType="NVarChar(200)")]
 | 
							[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TreatmentMeasures", DbType="NVarChar(2000)")]
 | 
				
			||||||
		public string TreatmentMeasures
 | 
							public string TreatmentMeasures
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			get
 | 
								get
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue