订单详情新增

物流进度新增
用户合并修改

src/main/java/com/peanut/modules/master/controller/UserManageController.java

@@ -20,7 +20,7 @@ import java.util.Map;
 @Slf4j
 @RestController("masterUserManage")
 @RequestMapping("master/userManage")
-public class UserMergeController {
+public class UserManageController {
 
     @Autowired
     private UserManageService mergeService;