mashuai
|
11ba920fcc
|
大屏接口修改
|
2023-12-09 16:37:28 +08:00 |
|
mashuai
|
5d6579fb82
|
大屏接口修改
|
2023-12-09 16:37:03 +08:00 |
|
mashuai
|
d259b39b1f
|
fix
|
2023-12-09 15:52:39 +08:00 |
 zfhai
|
45bdaba5cd
|
提交相关代码
|
2023-12-09 15:01:55 +08:00 |
|
zfhai
|
1b67fe5d1b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-09 14:59:31 +08:00 |
nmy
|
4eab7c20f2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-09 14:47:04 +08:00 |
|
nmy
|
b3b8cdede3
|
【更新】注册逻辑优化
|
2023-12-09 14:47:01 +08:00 |
sxu
|
be6ce9ea06
|
fix
|
2023-12-09 14:44:36 +08:00 |
|
zfhai
|
b9d05eaba9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-09 14:24:26 +08:00 |
|
sxu
|
0c34b37fd6
|
fix
|
2023-12-09 14:19:55 +08:00 |
|
sxu
|
157102a957
|
fix
|
2023-12-09 13:08:10 +08:00 |
|
sxu
|
5bf3aa0cab
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev
|
2023-12-09 12:58:07 +08:00 |
|
sxu
|
6a1174c58f
|
fix
|
2023-12-09 12:57:17 +08:00 |
|
zfhai
|
3cc9c84d5e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-09 11:38:44 +08:00 |
|
nmy
|
6599ea248a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-09 11:38:16 +08:00 |
|
nmy
|
c7d4515410
|
【更新】注册逻辑优化
|
2023-12-09 11:38:12 +08:00 |
|
sxu
|
1d0a20aaae
|
fix
|
2023-12-09 11:37:31 +08:00 |
|
zfhai
|
749fa796ea
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
|
2023-12-09 11:30:58 +08:00 |
|
zfhai
|
04f0676e73
|
提交相关代码
|
2023-12-09 11:30:27 +08:00 |
|
sxu
|
b576d16c85
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev
|
2023-12-09 11:24:41 +08:00 |
|
sxu
|
bb7d6fb77c
|
fix
|
2023-12-09 11:23:59 +08:00 |
|
nmy
|
83dffa593f
|
【更新】注册逻辑优化
|
2023-12-09 10:43:51 +08:00 |
|
nmy
|
41490f42af
|
【更新】注册逻辑优化
|
2023-12-09 10:43:43 +08:00 |
|
nmy
|
d584a157ef
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-09 10:42:20 +08:00 |
|
nmy
|
bda31c5b1e
|
【更新】注册逻辑优化
|
2023-12-09 10:42:16 +08:00 |
|
mashuai
|
3483dc0e90
|
修改短信id
|
2023-12-09 10:31:27 +08:00 |
|
nmy
|
d3704ad147
|
【更新】注册逻辑优化
|
2023-12-09 10:21:10 +08:00 |
|
sxu
|
0ea8d27694
|
fix
|
2023-12-08 20:11:50 +08:00 |
|
sxu
|
ad76f4b307
|
fix
|
2023-12-08 20:02:02 +08:00 |
|
sxu
|
c4b43e5ee6
|
fix
|
2023-12-08 19:23:26 +08:00 |
|
sxu
|
6f12f8b394
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev
|
2023-12-08 17:52:30 +08:00 |
|
sxu
|
92b5bfd676
|
fix
|
2023-12-08 17:52:22 +08:00 |
|
nmy
|
cf10de2628
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-08 17:42:03 +08:00 |
|
nmy
|
da44c72628
|
【更新】pom 文件编写
|
2023-12-08 17:42:00 +08:00 |
|
sxu
|
f25b863f38
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev
|
2023-12-08 17:36:36 +08:00 |
|
sxu
|
268d157203
|
fix
|
2023-12-08 17:35:24 +08:00 |
syruan
|
50198ee819
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-08 17:33:39 +08:00 |
|
syruan
|
49dd582e5a
|
腾讯云短信SMS配置及接口
|
2023-12-08 17:33:21 +08:00 |
|
sxu
|
5a94bafff3
|
fix
|
2023-12-08 17:27:22 +08:00 |
|
sxu
|
40d1a80c80
|
fix
|
2023-12-08 16:39:44 +08:00 |
|
sxu
|
9f185dd9a7
|
fix
|
2023-12-08 15:34:48 +08:00 |
|
sxu
|
0d2927a2ca
|
fix
|
2023-12-08 15:19:39 +08:00 |
|
zfhai
|
08dc0a7d96
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-08 14:21:40 +08:00 |
|
zfhai
|
3dff0c3b35
|
提交相关代码
|
2023-12-08 14:21:33 +08:00 |
|
nmy
|
b6b9c71fa6
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
# zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/BaseAddressController.java
|
2023-12-08 14:14:26 +08:00 |
|
nmy
|
d5302deb2c
|
【更新】dockerfile 文件编写
|
2023-12-08 14:13:56 +08:00 |
|
zfhai
|
3077109102
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-08 14:01:50 +08:00 |
|
zfhai
|
e4315a5ab3
|
提交相关代码
|
2023-12-08 14:01:39 +08:00 |
|
mashuai
|
b87ea7766a
|
修改
|
2023-12-08 13:53:43 +08:00 |
|
sxu
|
e13dc8f6fa
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev
|
2023-12-08 13:45:30 +08:00 |