You've already forked FrameTour-BE
# Conflicts: # src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java # src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java
# Conflicts: # src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java # src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java