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

2024-02-21 16:40:39 +07:00 · 2024-02-21 16:40:39 +07:00 · ba5dffed2c
commit ba5dffed2c
parent ca5f7eff9c 60b012af7d
17 changed files with 824 additions and 34 deletions
--- a/image/collectiing/bd_pay_with_codeAEON.png
+++ b/image/collectiing/bd_pay_with_codeAEON.png
--- a/image/collectiing/bn_pay_with_codeAEON.png
+++ b/image/collectiing/bn_pay_with_codeAEON.png
--- a/image/collectiing/bp_pay_with_codeAEON.png
+++ b/image/collectiing/bp_pay_with_codeAEON.png
--- a/image/collectiing/img_popupAEON.png
+++ b/image/collectiing/img_popupAEON.png
--- a/image/collectiing/img_popupGrab2.png
+++ b/image/collectiing/img_popupGrab2.png
--- a/image/collectiing/text_43_2.png
+++ b/image/collectiing/text_43_2.png
--- a/image/collectiing/text_46.png
+++ b/image/collectiing/text_46.png
--- a/image/collectiing_en/bd_pay_with_codeAEON.png
+++ b/image/collectiing_en/bd_pay_with_codeAEON.png
--- a/image/collectiing_en/bn_pay_with_codeAEON.png
+++ b/image/collectiing_en/bn_pay_with_codeAEON.png
--- a/image/collectiing_en/bp_pay_with_codeAEON.png
+++ b/image/collectiing_en/bp_pay_with_codeAEON.png
--- a/image/collectiing_en/img_popupAEON.png
+++ b/image/collectiing_en/img_popupAEON.png
--- a/image/collectiing_en/img_popupGrab2.png
+++ b/image/collectiing_en/img_popupGrab2.png
--- a/image/collectiing_en/text_43_2.png
+++ b/image/collectiing_en/text_43_2.png
--- a/image/collectiing_en/text_46.png
+++ b/image/collectiing_en/text_46.png