# Conflicts: # ch-dao/src/main/java/com/wwdz/ch/db/mapper/distribution/DistributionOrderMapper.java # ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java
# Conflicts: # ch-wx-api/src/main/java/com/wwdz/ch/wx/service/distribution/SendMsgService.java
