• 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
Name
Last commit
Last update
..
BDemo Loading commit data...
BGeneralBusiness Loading commit data...
BGoods Loading commit data...
BMediator Loading commit data...
BOrder Loading commit data...
BRoot Loading commit data...
BSetting Loading commit data...
BXBridBusiness Loading commit data...
newscontent Loading commit data...