Commit Graph

184 Commits

Author SHA1 Message Date
nmy aa3540c2c1 【更新】cpg 2023-12-06 16:14:19 +08:00
sxu 3d06a48f9f fix 2023-12-06 15:48:55 +08:00
sxu 3753a0695a fixconflict 2023-12-06 15:35:27 +08:00
sxu 714a04e54d fix 2023-12-06 15:33:17 +08:00
syruan e7e81651c3 腾讯云短信SMS配置及接口 2023-12-06 15:30:56 +08:00
zfhai 96c6604543 提交相关代码 2023-12-06 15:14:52 +08:00
sxu a5e2c3b12a Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-06 15:00:17 +08:00
sxu cb0a772198 fix 2023-12-06 15:00:01 +08:00
mashuai 79bad02eee 测试代码 2023-12-06 14:42:33 +08:00
sxu 468956451c fix 2023-12-06 14:09:48 +08:00
sxu fb86c830c0 fix 2023-12-06 13:48:30 +08:00
zfhai 8741259196 提交相关代码 2023-12-06 13:07:00 +08:00
sxu 446a28ba71 fix 2023-12-06 12:59:46 +08:00
sxu 07ba6e4c23 fix 2023-12-06 12:12:44 +08:00
nmy 2272d6df41 【更新】feign抽取 2023-12-06 10:57:43 +08:00
nmy 5c0a3e2b62 【更新】feign抽取 2023-12-06 10:39:17 +08:00
nmy f580741d41 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
2023-12-06 10:37:19 +08:00
nmy 858633b10d 【更新】feign抽取 2023-12-06 10:37:06 +08:00
sxu 26b12c8012 fix 2023-12-06 09:49:22 +08:00
mashuai ea92fdef4c 添加代码 2023-12-06 09:28:07 +08:00
mashuai ca08d32dab 隐私协议模板 2023-12-05 21:51:28 +08:00
sxu 797e038764 Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-05 21:38:54 +08:00
sxu 1df7b972e7 fix 2023-12-05 21:38:30 +08:00
nmy 64771537ce Merge remote-tracking branch 'origin/dev' into dev 2023-12-05 21:33:02 +08:00
nmy 7eb5c67db7 【更新】 2023-12-05 21:32:58 +08:00
sxu a5fc2bb3d5 fix 2023-12-05 21:24:31 +08:00
sxu 68a8915d36 Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-05 20:58:02 +08:00
sxu 064a5710ba fix 2023-12-05 20:56:22 +08:00
nmy a6b5085f09 【更新】company模块端口更改 2023-12-05 20:53:37 +08:00
nmy eb8f57b7a3 Merge remote-tracking branch 'origin/dev' into dev 2023-12-05 20:32:50 +08:00
nmy 594758ff9b 【更新】表删除后更新代码结构 2023-12-05 20:32:47 +08:00
sxu 4f7d272cac fix 2023-12-05 20:15:10 +08:00
sxu 2b3d6e02a4 fix 2023-12-05 19:42:34 +08:00
sxu f78f8c1a64 Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-05 19:35:09 +08:00
sxu 486dd1239f fix 2023-12-05 19:35:03 +08:00
nmy 308988605c 【新增】企业信息表字段新增 2023-12-05 19:03:57 +08:00
nmy 43cdae60bf Merge remote-tracking branch 'origin/dev' into dev 2023-12-05 17:34:43 +08:00
nmy 56105fbf6d 【新增】企业信息表字段新增 2023-12-05 17:34:40 +08:00
sxu 4a882aa4e3 fix 2023-12-05 17:19:40 +08:00
nmy 7fd9e9e9e0 【修改】文件导出新增文件名称编写 2023-12-05 16:54:11 +08:00
zfhai 29ddfa9583 提交相关代码 2023-12-05 16:38:24 +08:00
nmy d560d48070 【修改】文件导出新增文件名称编写 2023-12-05 16:34:08 +08:00
sxu 00c89876bf fix conflict 2023-12-05 16:28:48 +08:00
sxu d3254353ca fix 2023-12-05 16:19:41 +08:00
zfhai 18ae513d66 Merge remote-tracking branch 'origin/dev' into dev 2023-12-05 16:18:02 +08:00
zfhai df3004236c 提交相关代码 2023-12-05 16:17:54 +08:00
nmy bd8c62efa4 【修改】文件导出新增文件名称编写 2023-12-05 16:16:35 +08:00
nmy a1e49464af 【修改】文件导出新增文件名称编写 2023-12-05 16:13:13 +08:00
nmy c6da517c99 【修改】文件导出新增文件名称编写 2023-12-05 16:09:49 +08:00
nmy a000ad6401 【新增】logoUrl字段新增 2023-12-05 15:41:15 +08:00