Skip to content

S
ShenghuoquanBusiness
Switch branch/tag
  1. 28 Jul, 2021 6 commits
  3. 27 Jul, 2021 3 commits
  5. 26 Jul, 2021 10 commits
  7. 24 Jul, 2021 2 commits
  9. 23 Jul, 2021 8 commits
  11. 22 Jul, 2021 6 commits
  13. 21 Jul, 2021 5 commits
    • yinjiacheng's avatar
      fix SHQBD-886 修复C端创建的未认证生活号在B端认证的逻辑 · eb890ce2
      yinjiacheng authored
      eb890ce2
    • shiyl's avatar
      处理合并代码后的运行错误 · 818bab5a
      shiyl authored
      818bab5a
    • shiyl's avatar
      Merge branch 'dev_commodity' into feature/dev_order · 0c301c6f
      shiyl authored 
      # Conflicts:
#	Components/BXBridBusiness/src/main/assets/www
      0c301c6f
    • shiyl's avatar
      Merge branch 'feature/dev_order' of... · 607833f5
      shiyl authored 
      Merge branch 'feature/dev_order' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into feature/dev_order

# Conflicts:
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/service/CommentService.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/service/DeepLinkService.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/service/RequestService.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/service/UniversalService.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/CommentWebFragment.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/DeepLinkActivity.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LifeAccountEnterpriseCertificationActivity.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/NewsContentActivity.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/ProductSupportActivity.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/alive/AliveTestActivity.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/ProtocolDialog.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/ProtocolHintDialog.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/ShareDialog.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/ShareImageDialog.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/SharePosterDialog.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/utils/AccountUtil.kt
      607833f5
    • shiyl's avatar
      H5调用的网络服务迁移到BGeneralBusiness · 9a114c0d
      shiyl authored
      9a114c0d