- 21 Nov, 2020 1 commit
-
-
宁斌 committed
-
- 19 Nov, 2020 1 commit
-
-
宁斌 committed
-
- 13 Nov, 2020 3 commits
-
-
# Conflicts: # base-module/build.gradle # base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/GlobalConfiguration.java # delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/network/ServiceCreator.kt # delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java
宁斌 committed -
宁斌 committed
-
Signed-off-by: Wyh <1239658231>
Wyh committed
-
- 11 Nov, 2020 1 commit
-
-
宁斌 committed
-
- 10 Nov, 2020 3 commits
-
-
Signed-off-by: Wyh <1239658231>
Wyh committed -
# Conflicts: # config.gradle # delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java # print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrder.java # print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrderClosing.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/presenter/MealStandPresenter.java # table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
Wyh committed -
Signed-off-by: Wyh <1239658231>
Wyh committed
-
- 07 Nov, 2020 2 commits
- 06 Nov, 2020 2 commits
- 04 Nov, 2020 3 commits
- 03 Nov, 2020 1 commit
-
-
宁斌 committed
-
- 31 Oct, 2020 6 commits
-
-
宁斌 committed
-
# 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 -
宁斌 committed
-
宁斌 committed
-
Wyh committed
-
Signed-off-by: Wyh <1239658231>
Wyh committed
-
- 30 Oct, 2020 4 commits
- 29 Oct, 2020 1 commit
-
-
宁斌 committed
-
- 28 Oct, 2020 1 commit
-
-
宁斌 committed
-
- 27 Oct, 2020 3 commits
- 26 Oct, 2020 1 commit
-
-
宁斌 committed
-
- 24 Oct, 2020 3 commits
- 23 Oct, 2020 2 commits
- 22 Oct, 2020 2 commits
