Merge branch 'yongpxu-dev' into yongpxu-master
# Conflicts: # Cunkebao/app/content/[id]/materials/new/page.tsx resolved by yongpxu-master version # Cunkebao/app/content/[id]/materials/page.tsx resolved by yongpxu-master version # Cunkebao/app/workspace/moments-sync/[id]/page.tsx resolved by yongpxu-master version # nkebao/package-lock.json resolved by yongpxu-master version # nkebao/src/api/autoLike.ts resolved by yongpxu-dev version # nkebao/src/components/ui/input.tsx resolved by yongpxu-dev version # nkebao/yarn.lock resolved by yongpxu-master version
This commit is contained in:
@@ -61,6 +61,7 @@ function App() {
|
||||
<Route path="/workspace/auto-like" element={<AutoLike />} />
|
||||
<Route path="/workspace/auto-like/new" element={<NewAutoLike />} />
|
||||
<Route path="/workspace/auto-like/:id" element={<AutoLikeDetail />} />
|
||||
<Route path="/workspace/auto-like/:id/edit" element={<NewAutoLike />} />
|
||||
<Route path="/workspace/auto-group" element={<AutoGroup />} />
|
||||
<Route path="/workspace/auto-group/:id" element={<AutoGroupDetail />} />
|
||||
<Route path="/workspace/group-push" element={<GroupPush />} />
|
||||
|
||||
Reference in New Issue
Block a user