2105 Commits

Author SHA1 Message Date
18401019693
d7e4ad9aca 金币兑换砖石,星币页面,消费记录页面 2023-10-23 14:35:18 +08:00
be02488180 update 2023-10-22 23:15:54 +08:00
hch
ebeb276bb1 達人認證 2023-10-20 18:26:51 +08:00
d3ab50e844 update 2023-10-20 18:25:06 +08:00
0935f76bac update 2023-10-20 18:07:39 +08:00
0b28dd94d1 update 2023-10-20 18:05:25 +08:00
18401019693
df20d942d5 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts:
#	OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
#	OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
2023-10-20 15:32:46 +08:00
18401019693
dff84a30e4 消费记录 2023-10-20 15:31:52 +08:00
hch
0287995bf9 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts:
#	OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
2023-10-19 18:28:24 +08:00
hch
bcfd1c22e6 真人认证 2023-10-19 18:27:39 +08:00
18142669586
38471cedc8 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊 2023-10-19 15:15:30 +08:00
18142669586
f22ad82d84 增加第三方登录可以正常登录了 2023-10-19 15:15:18 +08:00
18401019693
993b09b853 修改中英文 2023-10-19 09:45:45 +08:00
18142669586
e6c8495158 1 2023-10-18 22:21:57 +08:00
18401019693
e15953dc64 修改中英文 2023-10-18 17:26:37 +08:00
4ff1089549 update 视频、音频 2023-10-18 16:17:07 +08:00
hch
9e68f35627 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊 2023-10-18 14:33:13 +08:00
hch
1a36077fba 编辑资料 2023-10-18 14:32:57 +08:00
d4305708f4 update 视频 2023-10-17 18:29:16 +08:00
18401019693
4ff529ace9 修改中英文 2023-10-17 17:59:10 +08:00
18401019693
530622c72c 修改中英文 2023-10-17 17:47:32 +08:00
hch
4f5085fc85 設定入口 2023-10-17 17:26:18 +08:00
hch
1f0cdd86a4 设置标签 2023-10-17 16:26:27 +08:00
18401019693
7f38739ddc 修改中英文 2023-10-17 15:59:58 +08:00
18401019693
bc549d52f6 修改中英文 2023-10-17 15:00:20 +08:00
hch
d2639ceb6a 处理冲突 2023-10-17 14:39:39 +08:00
0ea00b2b64 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts:
#	OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
2023-10-17 13:47:29 +08:00
6b992eefe4 update 2023-10-17 13:45:40 +08:00
hch
da6782c7b0 处理冲突 2023-10-17 11:19:46 +08:00
18401019693
14f0de093e 修改中英文 2023-10-16 18:23:59 +08:00
hch
52d565c4ee Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts:
#	OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
#	OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
2023-10-16 18:21:11 +08:00
hch
9ae47dffc2 设置基本资料 2023-10-16 18:18:35 +08:00
18401019693
51457738d2 修改中英文 2023-10-16 17:01:46 +08:00
18401019693
d8a0427791 修改中英文 2023-10-16 16:30:54 +08:00
6211756744 update 排行榜 筛选 搜索 2023-10-14 18:23:08 +08:00
18401019693
8abf92d42c 修改中英文 2023-10-14 17:05:14 +08:00
0c5533ffb3 update 对话框,相册相机 2023-10-14 10:55:14 +08:00
427d10158b update 2023-10-13 18:29:38 +08:00
18401019693
fc2d700a31 修改中英文 2023-10-13 17:48:42 +08:00
18401019693
867029fa3a 修改中英文 2023-10-13 16:06:07 +08:00
18401019693
52e199b901 修改中英文 2023-10-13 14:09:34 +08:00
abeb92ab51 update 2023-10-13 09:57:35 +08:00
fb5fc83727 Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊 2023-10-12 18:12:48 +08:00
5ee72410b7 update 2023-10-12 18:12:34 +08:00
18401019693
c5d537fb4d 修改中英文 2023-10-12 16:19:27 +08:00
0706611df8 update 聊天长按气泡 2023-10-12 14:40:47 +08:00
18401019693
e081f1e058 修改中英文 2023-10-12 14:26:10 +08:00
095574296f update 2023-10-11 21:43:26 +08:00
1424ff61e1 update 2023-10-11 18:28:33 +08:00
18401019693
7bedf93dd5 修改中英文 2023-10-11 17:26:07 +08:00