Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/Branch_Dev_jUnitTest'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/test/java/capstone/lip/landinformationportal/service/crawlRealEstateService/CrawlRealEstateServiceTest_1.java
#	src/test/java/capstone/lip/landinformationportal/service/feedback/FeedbackServiceTest_2.java
  • Loading branch information
@tuansu2021998
tuansu2021998 committed Apr 24, 2020
2 parents 9bdc22f + af8b559 commit 82e3142
Show file tree
Hide file tree
Showing 7 changed files with 1,081 additions and 677 deletions.
Loading

0 comments on commit 82e3142

Please sign in to comment.