Commit b5d43e71 by yangfangfang

Merge remote-tracking branch 'origin/yff' into yff

# Conflicts:
#	src/main/java/com/xiaomai/enums/ApiModule.java
parents 08084911 b2ec91b7
......@@ -54,4 +54,5 @@ public class ApiModule {
public static String Lunar_Invitation = "lunar_invitation";
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment