Commit 6e63c2ce0babbd75490cfda5836f2ad1c86c4cdf
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # src/main/resources/generatorConfig.xml
Showing
2 changed files
with
1 additions
and
2 deletions
pom.xml
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | <modelVersion>4.0.0</modelVersion> | 4 | <modelVersion>4.0.0</modelVersion> |
| 5 | 5 | ||
| 6 | <groupId>com.cnlive.shenhe</groupId> | 6 | <groupId>com.cnlive.shenhe</groupId> |
| 7 | - <artifactId>cnlive_shenhe</artifactId> | 7 | + <artifactId>cnlive_shenhe_test</artifactId> |
| 8 | <version>0.0.1-SNAPSHOT</version> | 8 | <version>0.0.1-SNAPSHOT</version> |
| 9 | <packaging>jar</packaging> | 9 | <packaging>jar</packaging> |
| 10 | 10 |
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java