Skip to content

S
supplier
Switch branch/tag
  1. 31 Oct, 2020 5 commits
    • Merge branch 'youhua' into dev · 6e91dc54 
      # Conflicts:
#	arms/build.gradle
#	base-module/build.gradle
#	base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/ExpandInfoSetting.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/UIStyleExtendedConfiguration.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/Discount.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DiscountDao.java
#	config.gradle
#	delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/SendOrderActivity.java
#	order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/OrderDiscount.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
#	print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintTestActivity.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/cart/ShoppingCart.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/NomalDiscount.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java
      宁斌 committed
    • Merge branch 'master' into dev · 8366fd1e
      宁斌 committed
    • 引入rxjava工具類 · ce4cd6d7
      宁斌 committed
    • Merge remote-tracking branch 'origin/dev' into dev · 4cce725c
      Wyh committed
    • 1、PRJ重印優化 2、餐牌一些頁面提交 3、在android 8.0設備上activity不能設置為透明且方向固定 · f947efa6 
      Signed-off-by: Wyh <1239658231>
      Wyh committed
  3. 30 Oct, 2020 4 commits
  5. 29 Oct, 2020 1 commit
  7. 28 Oct, 2020 1 commit
  9. 27 Oct, 2020 3 commits
  11. 26 Oct, 2020 1 commit
  13. 24 Oct, 2020 3 commits
  15. 23 Oct, 2020 2 commits
  17. 22 Oct, 2020 7 commits
  19. 21 Oct, 2020 1 commit
  21. 20 Oct, 2020 1 commit
  23. 17 Oct, 2020 8 commits
  25. 16 Oct, 2020 3 commits