Commit Graph

11 Commits

Author SHA1 Message Date
mashuai 3699da73e3 轮播图及专题资讯 2023-12-05 15:28:52 +08:00
nmy f7419f6aa5 【新增】代码编写 2023-12-05 15:18:14 +08:00
nmy 0d1dc53b5c 【新增】代码编写 2023-12-05 14:54:19 +08:00
zfhai 65cc4469f7 提交相关代码 2023-12-04 19:31:15 +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 ab59198455 move equip po 2023-12-03 17:33:39 +08:00
syruan 61e7ea2954 腾讯云COS存储桶服务 2023-12-03 16:48:30 +08:00
syruan 28ffda3b06 POM配置提交 2023-12-02 15:58:24 +08:00
syruan 411f26aadf POM配置提交 2023-12-02 15:34:20 +08:00
syruan 817a6839fe zltp-company服务 2023-12-02 15:14:14 +08:00