diff --git a/FLSystem/Forms/cps_manage_control.cs b/FLSystem/Forms/cps_manage_control.cs
index 903a6a9..ab02aa8 100644
--- a/FLSystem/Forms/cps_manage_control.cs
+++ b/FLSystem/Forms/cps_manage_control.cs
@@ -420,7 +420,7 @@ namespace FLSystem.Forms
private void barButtonItem46_ItemClick(object sender, ItemClickEventArgs e)
{
//TODO 快手
- //return;
+ return;
LoginCps(CpsType.快手联盟);
}
diff --git a/FLSystem/Forms/main.cs b/FLSystem/Forms/main.cs
index b6aac4c..5168b1d 100644
--- a/FLSystem/Forms/main.cs
+++ b/FLSystem/Forms/main.cs
@@ -1384,7 +1384,7 @@ namespace FLSystem.Forms
case "快手订单管理":
{
//TODO 快手
- //throw new Exception("该功能尚未开发完成,请等待更新!");
+ throw new Exception("该功能尚未开发完成,请等待更新!");
control = new cps_order_kuaishou(username);
break;
}
@@ -2624,7 +2624,7 @@ namespace FLSystem.Forms
private void barButtonItem108_ItemClick(object sender, ItemClickEventArgs e)
{
//TODO 快手
- //return;
+ return;
if (LoginCps(CpsType.快手联盟) != null)
ItemClick(btn_cps_manage, e);
}
diff --git a/应用/Delivery.Plugin/Delivery.Plugin.csproj b/应用/Delivery.Plugin/Delivery.Plugin.csproj
index 748db25..b619537 100644
--- a/应用/Delivery.Plugin/Delivery.Plugin.csproj
+++ b/应用/Delivery.Plugin/Delivery.Plugin.csproj
@@ -144,6 +144,7 @@
KuaidiForm.cs
+
ResXFileCodeGenerator
Resources.Designer.cs
diff --git a/应用/Delivery.Plugin/Properties/licenses.licx b/应用/Delivery.Plugin/Properties/licenses.licx
new file mode 100644
index 0000000..fb06462
--- /dev/null
+++ b/应用/Delivery.Plugin/Properties/licenses.licx
@@ -0,0 +1 @@
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/类库/Chat.Framework/WXSdk/Implement/WXClientImpl_IPAD.cs b/类库/Chat.Framework/WXSdk/Implement/WXClientImpl_IPAD.cs
index 836fb61..895332d 100644
--- a/类库/Chat.Framework/WXSdk/Implement/WXClientImpl_IPAD.cs
+++ b/类库/Chat.Framework/WXSdk/Implement/WXClientImpl_IPAD.cs
@@ -40,8 +40,8 @@ namespace Chat.Framework.WXSdk.Implement
result = result.Replace("🔑", "¥");
result = Util.RemoveEmoji(result);
- LogHelper.GetSingleObj().Debug("收到消息", result + @"
-");
+// LogHelper.GetSingleObj().Debug("收到消息", result + @"
+//");
var list = Util.ConvertJsonToObj(result);
if (list == null) return;