Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS
This commit is contained in:
commit
7c8f5b2477
|
|
@ -101,11 +101,6 @@ namespace BLL
|
||||||
needUpdatePic = true;
|
needUpdatePic = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(welder.WED_Code) && newWelder.WED_Code != welder.WED_Code)
|
|
||||||
{
|
|
||||||
newWelder.WED_Code = welder.WED_Code;
|
|
||||||
needUpdatePic = true;
|
|
||||||
}
|
|
||||||
db.SubmitChanges();
|
db.SubmitChanges();
|
||||||
if (needUpdatePic)
|
if (needUpdatePic)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,9 @@
|
||||||
<VisualStudio>
|
<VisualStudio>
|
||||||
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
||||||
<WebProjectProperties>
|
<WebProjectProperties>
|
||||||
<StartPageUrl>Login.aspx</StartPageUrl>
|
<StartPageUrl>
|
||||||
<StartAction>SpecificPage</StartAction>
|
</StartPageUrl>
|
||||||
|
<StartAction>CurrentPage</StartAction>
|
||||||
<AspNetDebugging>True</AspNetDebugging>
|
<AspNetDebugging>True</AspNetDebugging>
|
||||||
<SilverlightDebugging>False</SilverlightDebugging>
|
<SilverlightDebugging>False</SilverlightDebugging>
|
||||||
<NativeDebugging>False</NativeDebugging>
|
<NativeDebugging>False</NativeDebugging>
|
||||||
|
|
@ -34,7 +35,7 @@
|
||||||
<AutoAssignPort>True</AutoAssignPort>
|
<AutoAssignPort>True</AutoAssignPort>
|
||||||
<DevelopmentServerPort>0</DevelopmentServerPort>
|
<DevelopmentServerPort>0</DevelopmentServerPort>
|
||||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||||
<IISUrl>http://localhost:64304/</IISUrl>
|
<IISUrl>http://localhost:60961/</IISUrl>
|
||||||
<NTLMAuthentication>False</NTLMAuthentication>
|
<NTLMAuthentication>False</NTLMAuthentication>
|
||||||
<UseCustomServer>False</UseCustomServer>
|
<UseCustomServer>False</UseCustomServer>
|
||||||
<CustomServerUrl>
|
<CustomServerUrl>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue