Skip to content

S
ShenghuoquanBusiness
Switch branch/tag
  1. 24 Jul, 2021 1 commit
  3. 23 Jul, 2021 8 commits
  5. 22 Jul, 2021 6 commits
  7. 21 Jul, 2021 14 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
    • yinjiacheng's avatar
      del 代码整理 · 5b9af99f
      yinjiacheng authored
      5b9af99f
    • yinjiacheng's avatar
      update 应用图标 · c3754976
      yinjiacheng authored
      c3754976
    • shiyl's avatar
      删除app模块无用文件 · 3db42086
      shiyl authored
      3db42086
    • shiyl's avatar
      BRoot中新增三方库的初始化功能 · 608fb9d5
      shiyl authored
      608fb9d5
    • shiyl's avatar
      Merge branch 'dev_commodity' into feature/dev_order · 931ff79c
      shiyl authored 
      # Conflicts:
#	CommonLib/BCommon/src/main/java/com/yidian/bcommon/bean/LocalUploadImageBean.kt
#	CommonLib/BCommon/src/main/java/com/yidian/bcommon/services/ImageService.kt
#	CommonLib/BCommon/src/main/res/drawable-xxhdpi/bg_launcher.9.png
#	CommonLib/BCommon/src/main/res/drawable-xxhdpi/icon_launcher_bg.png
#	Components/BRoot/src/main/res/layout/activity_flash.xml
#	Components/BXBridBusiness/src/main/assets/www
#	Components/BXBridBusiness/src/main/java/com/yidian/shenghuoquan/bxbirdbusiness/ui/CommonWebViewActivity.kt
      931ff79c
    • shiyl's avatar
      Merge branch 'feature/dev_order' of... · 070ac106
      shiyl authored 
      Merge branch 'feature/dev_order' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into feature/dev_order
      070ac106
    • shiyl's avatar
      启动页迁移到BRoot组件 · a213af04
      shiyl authored
      a213af04
    • yinjiacheng's avatar
      update 页面路由名称修改 · ea6c823d
      yinjiacheng authored
      ea6c823d
    • yinjiacheng's avatar
      fix SHQBD-855 图片服务-图片上传增加上传队列 · b15ac1b5
      yinjiacheng authored
      b15ac1b5
  9. 20 Jul, 2021 11 commits