# Conflicts:
#	.idea/workspace.xml
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java

功能开发
1：1.0.0最终顶板

功能开发
商户端店铺信息bug

功能开发
隐私协议目的提示，通用询问

功能开发
1.1.0

# Conflicts:
#	.idea/workspace.xml
#	app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java

功能开发
申请修改

驳回原因修复

驳回原因修复

# Conflicts:
#	app/src/main/java/com/xx/merchanthbh/ui/mine/MineViewModel.java

驳回原因修复

# Conflicts:
#	app/src/main/java/com/xx/merchanthbh/ui/mine/MineViewModel.java

姓名消失修复

功能开发
合并1.0

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/xx/merchanthbh/data/http/ApiService.kt
#	app/src/main/java/com/xx/merchanthbh/data/http/requst/LogOffRequest.kt
#	app/src/main/java/com/xx/merchanthbh/data/http/requst/LoginRequest.kt
#	app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt
#	app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java
#	app/src/main/java/com/xx/merchanthbh/ui/logoff/LogOffActivity.java
#	app/src/main/java/com/xx/merchanthbh/ui/mine/MineViewModel.java
#	app/src/main/res/drawable/bg_forground_radius_no_24.xml
#	app/src/main/res/layout/activity_log_off.xml
#	app/src/main/res/layout/fragment_mine.xml
#	consumer/src/main/AndroidManifest.xml
#	consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java
#	hbhbcompany/src/main/java/com/xx/hbhbcompany/data/http/requst/LoginRequest.kt
#	hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginActivity.kt
#	hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginViewModel.java
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/MaterialDialogUtils.java
#	xxviewlibrary/src/main/java/com/xx/xxviewlibrary/comm/CommTextAgreeDialog.kt
#	xxviewlibrary/src/main/res/layout/dialog_comm_text_agree.xml

功能开发
正式版：添加相机权限申请

头像更新fixd

头像更新fixd

头像更新fixd

版本更新fixd

版本更新fixd

首次安装协议

首次安装协议

首次安装协议

运行文件

上传头像报错修复