Skip to content

S
supplier
Switch branch/tag
  1. 11 Jul, 2020 2 commits
  3. 10 Jul, 2020 1 commit
  5. 04 Jul, 2020 4 commits
  7. 03 Jul, 2020 4 commits
  9. 02 Jul, 2020 7 commits
  11. 30 Jun, 2020 4 commits
  13. 24 Jun, 2020 4 commits
  15. 23 Jun, 2020 3 commits
  17. 22 Jun, 2020 2 commits
  19. 20 Jun, 2020 1 commit
  21. 19 Jun, 2020 3 commits
  23. 18 Jun, 2020 3 commits
    • Merge remote-tracking branch 'origin/master' · b95e25c0
      宁斌 committed
    • 6.18 提交 · 29781066
      Wyh committed
    • Merge branch 'loach' · 3104f3a5 
      # Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/ui/recylcler/event/RecyItemTouchHelperCallback.java
#	config.gradle
#	main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/service/MainService.java
#	main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/NewMainPresenter.java
#	main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
#	main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/BusinessReportFragment.java
#	manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/model/bean/request/TableRequest.java
#	manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java
#	manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/TableListFragment.java
#	other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/CancelReason.kt
#	other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt
#	other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/OtherOrderActivity.kt
#	other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/DeliveryFragment.kt
#	other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/HistoryFragment.kt
#	other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/PlaceholderFragment.kt
#	other_order_mode/src/main/res/layout/fragment_delivery_list.xml
#	other_order_mode/src/main/res/layout/item_delivery_layout.xml
#	other_order_mode/src/main/res/values/styles.xml
#	print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
#	print-module/src/main/java/com/joe/print/mvp/print/TestPrintDataMaker.java
#	print-module/src/main/java/com/joe/print/mvp/ui/activity/IpPrintActivity.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/TableAdapter.java
      宁斌 committed
  25. 17 Jun, 2020 2 commits