wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 185433aec113b8d37d3911e4905ba994f2cf1aaa 1 parent d0a501cb

修改错误

Inline Side-by-side
Showing 1 changed file with 0 additions and 3 deletions
@@ -11,11 +11,8 @@ use WebPlugin\Cache; @@ -11,11 +11,8 @@ use WebPlugin\Cache;
11 use WebPlugin\Images; 11 use WebPlugin\Images;
12 use Configs\WebCacheConfig; 12 use Configs\WebCacheConfig;
13 use Hood\Core\Security\AuthCode; 13 use Hood\Core\Security\AuthCode;
14 -<<<<<<< HEAD  
15 use WebPlugin\UdpLog; 14 use WebPlugin\UdpLog;
16 -=======  
17 use Configs\ChannelConfig; 15 use Configs\ChannelConfig;
18 ->>>>>>> remotes/origin/release/4.4  
19 16
20 /** 17 /**
21 * 购物车相关的模板数据模型 18 * 购物车相关的模板数据模型