Merge branch 'master' of github.com:jtt-fan/KJD
This commit is contained in:
commit
457a8acee6
2 files changed
+6
-3
No files matched your search
@@ -8,7 +8,7 @@
|
|||||||
<IISExpressWindowsAuthentication />
|
<IISExpressWindowsAuthentication />
|
||||||
<IISExpressUseClassicPipelineMode />
|
<IISExpressUseClassicPipelineMode />
|
||||||
<UseGlobalApplicationHostFile />
|
<UseGlobalApplicationHostFile />
|
||||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||||
<ProjectView>ShowAllFiles</ProjectView>
|
<ProjectView>ShowAllFiles</ProjectView>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
|
|||||||
@@ -1301,13 +1301,16 @@ namespace TemuKJD.WXForms.AiTalkForms
|
|||||||
|
|
||||||
private void label4_Click(object sender, EventArgs e)
|
private void label4_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (BaseClass.ParentUserName == "15288888888" || BaseClass.UserName == "15288888888")
|
//if (BaseClass.ParentUserName == "15288888888" || BaseClass.UserName == "15288888888")
|
||||||
{
|
{
|
||||||
if (dgvShop.Parent.Controls[0] != dgvShop)
|
#if DEBUG
|
||||||
|
if (File.Exists(System.Environment.CurrentDirectory + "\\choice.debug.tools"))
|
||||||
|
if (dgvShop.Parent.Controls[0] != dgvShop)
|
||||||
dgvShop.BringToFront();
|
dgvShop.BringToFront();
|
||||||
else
|
else
|
||||||
dgvShop.SendToBack();
|
dgvShop.SendToBack();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
private void btnBatchBindShop_Click(object sender, EventArgs e)
|
private void btnBatchBindShop_Click(object sender, EventArgs e)
|
||||||
|
|||||||
Reference in new issue
Block a user