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 |
|
zfhai
|
550b6bf276
|
首页
|
2023-12-03 15:42:01 +08:00 |
|
zfhai
|
a8f6f6f19d
|
首页
|
2023-12-03 15:34:08 +08:00 |
|
mashuai
|
a89b24a956
|
大屏及首页模块代码更新
|
2023-12-03 15:29:52 +08:00 |
|
sxu
|
38eacc6575
|
fix issue
|
2023-12-03 15:04:28 +08:00 |
|
sxu
|
c8a9871a8b
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev
|
2023-12-03 13:21:34 +08:00 |
|
sxu
|
1bd144fe1f
|
fix issue
|
2023-12-03 13:21:21 +08:00 |
|
mashuai
|
81b6acbefc
|
大屏模块调试
|
2023-12-03 11:19:05 +08:00 |
|
sxu
|
481c01f1fb
|
fix issue
|
2023-12-03 11:12:27 +08:00 |
|
sxu
|
488e958cc5
|
fix issue
|
2023-12-03 10:58:15 +08:00 |
|
sxu
|
bbf02a0fca
|
fix issue
|
2023-12-02 16:34:41 +08:00 |
|
syruan
|
28ffda3b06
|
POM配置提交
|
2023-12-02 15:58:24 +08:00 |
|
syruan
|
411f26aadf
|
POM配置提交
|
2023-12-02 15:34:20 +08:00 |
|
nmy
|
989f28bbc2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-02 15:19:50 +08:00 |
|
sxu
|
288214c35f
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev
|
2023-12-02 15:19:15 +08:00 |
|
sxu
|
5e345300e0
|
add equip module
|
2023-12-02 15:18:58 +08:00 |
 syruan
|
817a6839fe
|
zltp-company服务
|
2023-12-02 15:14:14 +08:00 |
|
mashuai
|
850ffe3957
|
大屏模块
|
2023-12-02 14:53:57 +08:00 |
|
sxu
|
6a2259d048
|
add order module
|
2023-12-02 14:32:47 +08:00 |
|
zfhai
|
ca19749012
|
修改文件名
|
2023-12-02 14:29:24 +08:00 |
|
nmy
|
8fdef4222c
|
连接池版本配置
|
2023-12-02 14:28:15 +08:00 |
|
zfhai
|
6a4ce0a7f6
|
修改文件名
|
2023-12-02 14:15:17 +08:00 |
|
zfhai
|
78ed074cbd
|
修改文件名
|
2023-12-02 13:09:47 +08:00 |
|
mashuai
|
30b4f46135
|
大屏模块
|
2023-12-02 12:51:46 +08:00 |