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

2025-04-08 15:34:19 +07:00 · 2025-04-08 15:34:19 +07:00 · 0451cc1a05
commit 0451cc1a05
parent 70c2ed70d3 6a22521d36
68 changed files with 87196 additions and 52807 deletions
--- a/image/display_point_en/text8_mys.png
+++ b/image/display_point_en/text8_mys.png
--- a/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png
+++ b/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png
--- a/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png
+++ b/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png
--- a/image/page_drink_n/bn_Matcha_Latte_Premium.png
+++ b/image/page_drink_n/bn_Matcha_Latte_Premium.png
--- a/image/page_drink_n/bn_Matcha_Latte_X3.png
+++ b/image/page_drink_n/bn_Matcha_Latte_X3.png
--- a/image/page_drink_picture2_n/bn_Matcha_Latte_Premium.png
+++ b/image/page_drink_picture2_n/bn_Matcha_Latte_Premium.png
--- a/image/page_drink_picture2_n/bn_Matcha_Latte_X3.png
+++ b/image/page_drink_picture2_n/bn_Matcha_Latte_X3.png
--- a/image/page_drink_press_n/bn_Matcha_Latte_Premium.png
+++ b/image/page_drink_press_n/bn_Matcha_Latte_Premium.png
--- a/image/page_drink_press_n/bn_Matcha_Latte_X3.png
+++ b/image/page_drink_press_n/bn_Matcha_Latte_X3.png
--- a/image/smoothie/proccess/bn_cancel.png
+++ b/image/smoothie/proccess/bn_cancel.png
--- a/image/smoothie/proccess/bn_main_button.png
+++ b/image/smoothie/proccess/bn_main_button.png
--- a/image/smoothie/proccess/bp_main_button.png
+++ b/image/smoothie/proccess/bp_main_button.png