Merge remote-tracking branch 'origin/master-new-炒锅' into master-new-炒锅
# Conflicts:
# app/src/main/java/com/bonait/bnframework/ui/fragment/goods/LocalGoodsFragment.java
# app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateDataService.java
# app/src/main/java/com/bonait/bnframework/ui/widget/WaitProcessUtil.java
|