1. 25 Jul, 2024 5 commits
    • 小费同学阿's avatar
      基础搭建 · d2bf58e6
      小费同学阿 authored
      功能开发
      1:bug 修复 客商端商家添加商品时,点击这个区域也会触发提交审核
      d2bf58e6
    • 小费同学阿's avatar
      基础搭建 · be9b65ff
      小费同学阿 authored
      功能开发
      1:bug 修复 客商端添加商品多张崩溃问题
      be9b65ff
    • 杨秀秀's avatar
      基础搭建 · 7f14bb0c
      杨秀秀 authored
      功能开发
      1:添加map总览页面 7.25
      7f14bb0c
    • 杨秀秀's avatar
      基础搭建 · 82375c23
      杨秀秀 authored
      功能开发
      1:添加map总览页面 7.25
      82375c23
    • 杨秀秀's avatar
      基础搭建 · eb006dac
      杨秀秀 authored
      功能开发
      1:添加map总览页面 7.25
      eb006dac
  2. 24 Jul, 2024 2 commits
  3. 10 Jul, 2024 1 commit
  4. 30 May, 2024 1 commit
  5. 18 Apr, 2024 2 commits
  6. 17 Apr, 2024 2 commits
  7. 16 Apr, 2024 1 commit
    • 杨秀秀's avatar
      基础搭建 · 06b0acb5
      杨秀秀 authored
      功能开发
      商户端店铺信息bug
      06b0acb5
  8. 15 Apr, 2024 1 commit
    • 杨秀秀's avatar
      基础搭建 · 49b000b3
      杨秀秀 authored
      功能开发
      隐私协议目的提示,通用询问
      49b000b3
  9. 12 Apr, 2024 3 commits
  10. 11 Apr, 2024 1 commit
  11. 25 Mar, 2024 2 commits
  12. 22 Mar, 2024 1 commit
  13. 21 Mar, 2024 8 commits
  14. 20 Mar, 2024 2 commits
    • 杨秀秀's avatar
      Merge branch 'dev1.0' into dev1.0.1 · ee317855
      杨秀秀 authored
      # 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
      ee317855
    • 杨秀秀's avatar
      基础搭建 · fbacfa96
      杨秀秀 authored
      功能开发
      正式版:添加相机权限申请
      fbacfa96
  15. 27 Feb, 2024 4 commits
  16. 26 Feb, 2024 4 commits