# Conflicts: # pages/projectModule/projectDetail/projectDetail.js # pages/projectModule/projectDetail/projectDetail.wxml # pages/projectModule/projectList/projectList.js # pages/projectModule/projectList/projectList.wxml # pages/projectModule/userProject/userProject.js