Commit Graph

36 Commits

Author SHA1 Message Date
nmy bdc0c3ea2d 【更新】个人中心查询企业数据 2023-12-09 23:59:08 +08:00
nmy c2fa5fab87 【更新】个人中心查询企业数据 2023-12-09 23:53:03 +08:00
nmy bf0becc786 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java
#	zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
2023-12-09 22:48:51 +08:00
nmy 71cc43fe38 【更新】用户登录返回企业信息 2023-12-09 22:47:59 +08:00
zfhai f749219203 提交相关代码 2023-12-09 20:43:17 +08:00
nmy b3b8cdede3 【更新】注册逻辑优化 2023-12-09 14:47:01 +08:00
nmy c7d4515410 【更新】注册逻辑优化 2023-12-09 11:38:12 +08:00
nmy da44c72628 【更新】pom 文件编写 2023-12-08 17:42:00 +08:00
nmy d5302deb2c 【更新】dockerfile 文件编写 2023-12-08 14:13:56 +08:00
nmy f768a5b3f6 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/BaseAddressController.java
2023-12-08 10:17:06 +08:00
nmy f4db2442b3 【更新】代码修改 2023-12-08 10:16:45 +08:00
mashuai 04bc27175c company添加swagger注解 2023-12-07 14:46:19 +08:00
nmy 86b39ad494 【更新】新增字段 2023-12-07 10:17:40 +08:00
mashuai 79bad02eee 测试代码 2023-12-06 14:42:33 +08:00
nmy 2272d6df41 【更新】feign抽取 2023-12-06 10:57:43 +08:00
nmy 858633b10d 【更新】feign抽取 2023-12-06 10:37:06 +08:00
mashuai ca08d32dab 隐私协议模板 2023-12-05 21:51:28 +08:00
nmy 7eb5c67db7 【更新】 2023-12-05 21:32:58 +08:00
nmy a6b5085f09 【更新】company模块端口更改 2023-12-05 20:53:37 +08:00
nmy 308988605c 【新增】企业信息表字段新增 2023-12-05 19:03:57 +08:00
nmy 56105fbf6d 【新增】企业信息表字段新增 2023-12-05 17:34:40 +08:00
nmy 7fd9e9e9e0 【修改】文件导出新增文件名称编写 2023-12-05 16:54:11 +08:00
zfhai df3004236c 提交相关代码 2023-12-05 16:17:54 +08:00
nmy c6da517c99 【修改】文件导出新增文件名称编写 2023-12-05 16:09:49 +08:00
nmy a000ad6401 【新增】logoUrl字段新增 2023-12-05 15:41:15 +08:00
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