bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
230 Commits 2 Branches 0 Tags 3.8 MiB
Commit Graph

207 Commits

Author SHA1 Message Date
nmy da44c72628 【更新】pom 文件编写 2023-12-08 17:42:00 +08:00
sxu f25b863f38 Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-08 17:36:36 +08:00
sxu 268d157203 fix 2023-12-08 17:35:24 +08:00
syruan 50198ee819 Merge remote-tracking branch 'origin/dev' into dev 2023-12-08 17:33:39 +08:00
syruan 49dd582e5a 腾讯云短信SMS配置及接口 2023-12-08 17:33:21 +08:00
sxu 5a94bafff3 fix 2023-12-08 17:27:22 +08:00
sxu 40d1a80c80 fix 2023-12-08 16:39:44 +08:00
sxu 9f185dd9a7 fix 2023-12-08 15:34:48 +08:00
sxu 0d2927a2ca fix 2023-12-08 15:19:39 +08:00
zfhai 08dc0a7d96 Merge remote-tracking branch 'origin/dev' into dev 2023-12-08 14:21:40 +08:00
zfhai 3dff0c3b35 提交相关代码 2023-12-08 14:21:33 +08:00
nmy b6b9c71fa6 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
#	zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/BaseAddressController.java
 2023-12-08 14:14:26 +08:00
nmy d5302deb2c 【更新】dockerfile 文件编写 2023-12-08 14:13:56 +08:00
zfhai e4315a5ab3 提交相关代码 2023-12-08 14:01:39 +08:00
sxu e13dc8f6fa Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-08 13:45:30 +08:00
sxu d245ac027e fix 2023-12-08 13:45:10 +08:00
mashuai 16ea51a34d 修改 2023-12-08 13:31:54 +08:00
sxu d0cf721763 fix 2023-12-08 13:18:51 +08:00
sxu 8b3b5ce059 fix 2023-12-08 13:12:44 +08:00
sxu c2c0f28c4e Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-08 13:09:21 +08:00
sxu 2c90a0063c fix 2023-12-08 13:07:45 +08:00
mashuai ae71df9edc bigscreen 添加逻辑删除 2023-12-08 11:02:38 +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
zfhai 3b4e9cc0eb 提交相关代码 2023-12-07 16:25:04 +08:00
sxu a928c49d3c fix 2023-12-07 16:04:20 +08:00
mashuai 04bc27175c company添加swagger注解 2023-12-07 14:46:19 +08:00
sxu cd9a5581b9 order count 2023-12-07 13:58:44 +08:00
sxu 70e4fbd84a order count 2023-12-07 13:53:04 +08:00
sxu 9e511829f7 fix 2023-12-07 11:05:51 +08:00
sxu 4db92c15f1 fix 2023-12-07 10:28:07 +08:00
nmy 86b39ad494 【更新】新增字段 2023-12-07 10:17:40 +08:00
sxu a4e0d5422c fix 2023-12-06 20:32:10 +08:00
sxu eeffaa0491 fix 2023-12-06 20:20:48 +08:00
sxu 56fa00ea09 fix 2023-12-06 19:57:07 +08:00
sxu cc8fe8f4cf fix 2023-12-06 19:33:32 +08:00
sxu a3fc5f041a fix 2023-12-06 19:07:39 +08:00
sxu 5a3d7df4e7 fix 2023-12-06 17:16:39 +08:00
sxu cc7044b9fa Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-06 16:43:31 +08:00
sxu 10a6c56172 fix 2023-12-06 16:43:13 +08:00
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
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
sxu 00c89876bf fix conflict 2023-12-05 16:28:48 +08:00
sxu d3254353ca fix 2023-12-05 16:19:41 +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
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