Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

2022-09-09 14:08:56 +07:00 · 2022-09-09 14:08:56 +07:00 · 0975f6fb13
commit 0975f6fb13
parent 119634ea6b c822fd7f86
63 changed files with 2186 additions and 488 deletions
--- a/image/anmi/arrow_1.png
+++ b/image/anmi/arrow_1.png
--- a/image/page3_2/bn_appfast2.png
+++ b/image/page3_2/bn_appfast2.png
--- a/image/page3_2/bn_cho_ca2.png
+++ b/image/page3_2/bn_cho_ca2.png
--- a/image/page3_2/bn_coffee2.png
+++ b/image/page3_2/bn_coffee2.png
--- a/image/page3_2/bn_forkid2.png
+++ b/image/page3_2/bn_forkid2.png
--- a/image/page3_2/bn_health.png
+++ b/image/page3_2/bn_health.png
--- a/image/page3_2/bn_protein2.png
+++ b/image/page3_2/bn_protein2.png
--- a/image/page3_2/bn_recommend2.png
+++ b/image/page3_2/bn_recommend2.png
--- a/image/page3_2/bn_sodada2.png
+++ b/image/page3_2/bn_sodada2.png
--- a/image/page3_2/bn_tea2.png
+++ b/image/page3_2/bn_tea2.png
--- a/image/page3_2/bn_vending2.png
+++ b/image/page3_2/bn_vending2.png
--- a/image/page3_2/bp_appfast2.png
+++ b/image/page3_2/bp_appfast2.png
--- a/image/page3_2/bp_cho_ca2.png
+++ b/image/page3_2/bp_cho_ca2.png
--- a/image/page3_2/bp_coffee2.png
+++ b/image/page3_2/bp_coffee2.png
--- a/image/page3_2/bp_forkid2.png
+++ b/image/page3_2/bp_forkid2.png
--- a/image/page3_2/bp_health.png
+++ b/image/page3_2/bp_health.png
--- a/image/page3_2/bp_protein2.png
+++ b/image/page3_2/bp_protein2.png
--- a/image/page3_2/bp_recommend2.png
+++ b/image/page3_2/bp_recommend2.png
--- a/image/page3_2/bp_sodada2.png
+++ b/image/page3_2/bp_sodada2.png
--- a/image/page3_2/bp_tea2.png
+++ b/image/page3_2/bp_tea2.png
--- a/image/page3_2/bp_vending2.png
+++ b/image/page3_2/bp_vending2.png
--- a/image/page3_2_en/bn_appfast2.png
+++ b/image/page3_2_en/bn_appfast2.png
--- a/image/page3_2_en/bn_cho_ca2.png
+++ b/image/page3_2_en/bn_cho_ca2.png
--- a/image/page3_2_en/bn_coffee2.png
+++ b/image/page3_2_en/bn_coffee2.png
--- a/image/page3_2_en/bn_forkid2.png
+++ b/image/page3_2_en/bn_forkid2.png
--- a/image/page3_2_en/bn_health.png
+++ b/image/page3_2_en/bn_health.png
--- a/image/page3_2_en/bn_protein2.png
+++ b/image/page3_2_en/bn_protein2.png
--- a/image/page3_2_en/bn_recommend2.png
+++ b/image/page3_2_en/bn_recommend2.png
--- a/image/page3_2_en/bn_sodada2.png
+++ b/image/page3_2_en/bn_sodada2.png
--- a/image/page3_2_en/bn_tea2.png
+++ b/image/page3_2_en/bn_tea2.png
--- a/image/page3_2_en/bn_vending2.png
+++ b/image/page3_2_en/bn_vending2.png
--- a/image/page3_2_en/bp_appfast2.png
+++ b/image/page3_2_en/bp_appfast2.png
--- a/image/page3_2_en/bp_cho_ca2.png
+++ b/image/page3_2_en/bp_cho_ca2.png
--- a/image/page3_2_en/bp_coffee2.png
+++ b/image/page3_2_en/bp_coffee2.png
--- a/image/page3_2_en/bp_forkid2.png
+++ b/image/page3_2_en/bp_forkid2.png
--- a/image/page3_2_en/bp_health.png
+++ b/image/page3_2_en/bp_health.png
--- a/image/page3_2_en/bp_protein2.png
+++ b/image/page3_2_en/bp_protein2.png
--- a/image/page3_2_en/bp_recommend2.png
+++ b/image/page3_2_en/bp_recommend2.png
--- a/image/page3_2_en/bp_sodada2.png
+++ b/image/page3_2_en/bp_sodada2.png
--- a/image/page3_2_en/bp_tea2.png
+++ b/image/page3_2_en/bp_tea2.png
--- a/image/page3_2_en/bp_vending2.png
+++ b/image/page3_2_en/bp_vending2.png
--- a/image/topping2/bg_bottom.png
+++ b/image/topping2/bg_bottom.png
--- a/image/topping2/bg_row.png
+++ b/image/topping2/bg_row.png
--- a/image/topping2/bg_top.png
+++ b/image/topping2/bg_top.png
--- a/image/topping2/bg_top_b3shot.png
+++ b/image/topping2/bg_top_b3shot.png
--- a/image/topping2/bg_top_oreo.png
+++ b/image/topping2/bg_top_oreo.png
--- a/image/topping2/bg_top_shot.png
+++ b/image/topping2/bg_top_shot.png
--- a/image/topping2/bn_add_oreo.png
+++ b/image/topping2/bn_add_oreo.png
--- a/image/topping2/bp_add_oreo.png
+++ b/image/topping2/bp_add_oreo.png
--- a/image/topping2_en/bg_bottom.png
+++ b/image/topping2_en/bg_bottom.png
--- a/image/topping2_en/bg_top.png
+++ b/image/topping2_en/bg_top.png