- 09 Jul, 2021 11 commits
-
-
shiyl authored
-
shiyl authored
# Conflicts: # CommonLib/Common/src/main/java/com/yidian/common/base/BaseActivity.kt # app/build.gradle # app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt # config/config.gradle
-
shiyl authored
-
shiyl authored
Merge branch 'dev_commodity' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into dev_commodity
-
shiyl authored
-
yinjiacheng authored
-
yinjiacheng authored
-
shiyl authored
-
shiyl authored
-
yinjiacheng authored
-
yinjiacheng authored
-
- 08 Jul, 2021 6 commits
- 07 Jul, 2021 3 commits
-
-
shiyl authored
Merge branch 'dev_commodity' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into dev_commodity
-
shiyl authored
-
yinjiacheng authored
-
- 06 Jul, 2021 6 commits
- 05 Jul, 2021 10 commits
-
-
shiyl authored
-
yinjiacheng authored
-
yinjiacheng authored
-
https://git.yidian-inc.com:8021/bp/ShenghuoquanBusinessshiyl authored
# Conflicts: # config/config.gradle
-
shiyl authored
-
yinjiacheng authored
-
shiyl authored
# Conflicts: # CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt # CommonLib/Common/src/main/res/layout/layout_common_toolbar.xml # CommonLib/Common/src/main/res/values/colors.xml # Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt # Components/newscontent/src/main/res/layout/activity_system_setting.xml # app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt # config/config.gradle
-
shiyl authored
-
shiyl authored
-
shiyl authored
-
- 04 Jul, 2021 1 commit
-
-
yinjiacheng authored
-
- 02 Jul, 2021 2 commits
-
-
shiyl authored
-
yinjiacheng authored
-
- 01 Jul, 2021 1 commit
-
-
yinjiacheng authored
-