• 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
Name
Last commit
Last update
..
anim Loading commit data...
drawable Loading commit data...
drawable-xxhdpi Loading commit data...
layout Loading commit data...
mipmap-hdpi Loading commit data...
mipmap-mdpi Loading commit data...
mipmap-xhdpi Loading commit data...
mipmap-xxhdpi Loading commit data...
mipmap-xxxhdpi Loading commit data...
values Loading commit data...
xml Loading commit data...