sxu
|
0df8375a0c
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev
|
2023-12-05 15:25:46 +08:00 |
|
sxu
|
db369a5cbc
|
fix
|
2023-12-05 15:25:27 +08:00 |
nmy
|
d751f402bb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-05 15:18:18 +08:00 |
|
nmy
|
f7419f6aa5
|
【新增】代码编写
|
2023-12-05 15:18:14 +08:00 |
|
sxu
|
55abc7632d
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev
|
2023-12-05 15:09:24 +08:00 |
|
sxu
|
d79f694b7f
|
fix
|
2023-12-05 15:09:13 +08:00 |
|
nmy
|
0d1dc53b5c
|
【新增】代码编写
|
2023-12-05 14:54:19 +08:00 |
|
sxu
|
b9c6421c8d
|
fix
|
2023-12-05 14:46:54 +08:00 |
|
sxu
|
4e05bc5415
|
fix
|
2023-12-05 14:40:39 +08:00 |
|
sxu
|
84ff331b66
|
fix
|
2023-12-05 14:21:48 +08:00 |
|
sxu
|
3ace077b37
|
fix
|
2023-12-05 13:56:18 +08:00 |
|
sxu
|
813348c42b
|
fix
|
2023-12-05 13:22:36 +08:00 |
|
sxu
|
4873995fc8
|
fix
|
2023-12-05 11:21:09 +08:00 |
|
sxu
|
32dfc0b0de
|
fix
|
2023-12-05 10:56:30 +08:00 |
|
sxu
|
f504601071
|
fix
|
2023-12-05 10:43:07 +08:00 |
|
sxu
|
5b63dd28a1
|
fix
|
2023-12-05 10:30:21 +08:00 |
|
sxu
|
b8ed54ed4d
|
fix
|
2023-12-05 10:26:55 +08:00 |
|
sxu
|
11e250dd21
|
fix
|
2023-12-05 10:13:26 +08:00 |
|
sxu
|
f888a77581
|
fix
|
2023-12-04 20:41:09 +08:00 |
|
sxu
|
980527ffa2
|
fix
|
2023-12-04 20:21:27 +08:00 |
|
sxu
|
5df832845c
|
fix
|
2023-12-04 20:00:36 +08:00 |
|
sxu
|
4f3c6084a4
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev
|
2023-12-04 19:41:38 +08:00 |
|
sxu
|
45cce848f6
|
fix
|
2023-12-04 19:41:21 +08:00 |
|
nmy
|
ffce4497ea
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-04 19:39:17 +08:00 |
|
nmy
|
652f6857fa
|
【新增】代码编写
|
2023-12-04 19:39:14 +08:00 |
 zfhai
|
bec2b15853
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-04 19:31:21 +08:00 |
|
zfhai
|
65cc4469f7
|
提交相关代码
|
2023-12-04 19:31:15 +08:00 |
|
sxu
|
fc8f9aa364
|
fix
|
2023-12-04 18:57:08 +08:00 |
|
nmy
|
61ff731d15
|
【修改】代码位置修改
|
2023-12-04 18:14:49 +08:00 |
|
nmy
|
45085a79a6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-04 18:14:39 +08:00 |
|
nmy
|
a2d3b29f0a
|
【修改】代码位置修改
|
2023-12-04 18:14:32 +08:00 |
|
sxu
|
9221902f87
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev
|
2023-12-04 17:49:25 +08:00 |
|
sxu
|
970ceec599
|
fix
|
2023-12-04 17:49:17 +08:00 |
|
nmy
|
a6ad9f8c7e
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java
# zlpt-modules/zlpt-company/pom.xml
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessOpenController.java
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/BusinessOpen.java
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/BusinessOpenMapper.java
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/BusinessOpenService.java
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BusinessOpenServiceImpl.java
# zlpt-modules/zlpt-company/src/main/resources/mapper/BusinessOpenMapper.xml
# zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
# zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UpOffMapper.java
# zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/ITypeInfoService.java
# zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUpOffService.java
# zlpt-modules/zlpt-equip/src/main/resources/mapper/FileInfoMapper.xml
# zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml
|
2023-12-04 17:15:05 +08:00 |
|
nmy
|
b6ab2d0dcd
|
【新增】代码编写
|
2023-12-04 17:05:57 +08:00 |
|
sxu
|
45251006e7
|
fix
|
2023-12-04 16:56:34 +08:00 |
|
sxu
|
129961336c
|
fix
|
2023-12-04 15:53:48 +08:00 |
|
sxu
|
8bef3e34bc
|
fix
|
2023-12-04 14:45:23 +08:00 |
|
sxu
|
9d6bed3d9c
|
fix
|
2023-12-04 14:23:23 +08:00 |
|
sxu
|
0c392a056c
|
fix
|
2023-12-04 13:21:07 +08:00 |
|
sxu
|
4291dd51d4
|
fix
|
2023-12-04 13:05:55 +08:00 |
|
sxu
|
3185c5d3e9
|
fix
|
2023-12-04 12:57:13 +08:00 |
|
sxu
|
9357d0c959
|
fix
|
2023-12-04 12:49:40 +08:00 |
|
sxu
|
ce71ebd548
|
fix equip issue
|
2023-12-04 11:36:46 +08:00 |
mashuai
|
cb2627e375
|
轮播图及专题资讯
|
2023-12-04 11:09:25 +08:00 |
|
sxu
|
ab59198455
|
move equip po
|
2023-12-03 17:33:39 +08:00 |
|
sxu
|
9313ef050e
|
move equip po
|
2023-12-03 17:18:17 +08:00 |
|
sxu
|
749c343286
|
move order po
|
2023-12-03 17:12:53 +08:00 |
syruan
|
61e7ea2954
|
腾讯云COS存储桶服务
|
2023-12-03 16:48:30 +08:00 |
|
zfhai
|
388aaaaada
|
修改自动注入
|
2023-12-03 15:51:01 +08:00 |