1. 02 Dec, 2020 1 commit
  2. 01 Dec, 2020 1 commit
  3. 29 Nov, 2020 1 commit
  4. 26 Nov, 2020 1 commit
  5. 24 Nov, 2020 5 commits
  6. 21 Nov, 2020 1 commit
  7. 20 Nov, 2020 2 commits
  8. 19 Nov, 2020 1 commit
  9. 13 Nov, 2020 3 commits
  10. 11 Nov, 2020 1 commit
  11. 10 Nov, 2020 3 commits
  12. 07 Nov, 2020 2 commits
  13. 06 Nov, 2020 2 commits
  14. 04 Nov, 2020 3 commits
  15. 03 Nov, 2020 1 commit
  16. 31 Oct, 2020 6 commits
    • 添加skyokrder打印頁面UI · a1867471
      宁斌 committed
    • 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
  17. 30 Oct, 2020 4 commits
  18. 29 Oct, 2020 1 commit
  19. 28 Oct, 2020 1 commit