家里提交
家里提交
未修改
Merge branch 'master' of https://github.com/sunqimin09/FirstApp

Conflicts:
	AppTellOut/src/com/example/apptellout/BaseActivity.java
	AppTellOut/src/com/example/apptellout/EditMyInforAct.java
	AppTellOut/src/com/example/apptellout/Login_Regist_Act.java
	AppTellOut/src/com/example/apptellout/MainActivity.java
	AppTellOut/src/com/example/entity/BaseEntity.java
	AppTellOut/src/com/example/entity/UserEntity.java
	AppTellOut/src/com/example/util/GlobalRequestConfig.java
	AppTellOut/src/com/example/util/JsonHelper.java
	AppTellOut/src/com/example/util/TestJsonParse.java
	RemainingDate/src/com/example/appcolleageentrance/OutOfDayAct.java