Commit Graph

27 Commits

Author SHA1 Message Date
mashuai d259b39b1f fix 2023-12-09 15:52:39 +08:00
zfhai 1b67fe5d1b Merge remote-tracking branch 'origin/dev' into dev 2023-12-09 14:59:31 +08:00
nmy 4eab7c20f2 Merge remote-tracking branch 'origin/dev' into dev 2023-12-09 14:47:04 +08:00
nmy b3b8cdede3 【更新】注册逻辑优化 2023-12-09 14:47:01 +08:00
zfhai b9d05eaba9 Merge remote-tracking branch 'origin/dev' into dev 2023-12-09 14:24:26 +08:00
sxu 0c34b37fd6 fix 2023-12-09 14:19:55 +08:00
zfhai 3cc9c84d5e Merge remote-tracking branch 'origin/dev' into dev 2023-12-09 11:38:44 +08:00
nmy c7d4515410 【更新】注册逻辑优化 2023-12-09 11:38:12 +08:00
zfhai 749fa796ea Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
2023-12-09 11:30:58 +08:00
zfhai 04f0676e73 提交相关代码 2023-12-09 11:30:27 +08:00
sxu bb7d6fb77c fix 2023-12-09 11:23:59 +08:00
nmy d3704ad147 【更新】注册逻辑优化 2023-12-09 10:21:10 +08:00
sxu ad76f4b307 fix 2023-12-08 20:02:02 +08:00
sxu 40d1a80c80 fix 2023-12-08 16:39:44 +08:00
mashuai f24c30601b 实体类添加swagger注解 2023-12-08 12:42:33 +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
sxu 4db92c15f1 fix 2023-12-07 10:28:07 +08:00
nmy 86b39ad494 【更新】新增字段 2023-12-07 10:17:40 +08:00
sxu 10a6c56172 fix 2023-12-06 16:43:13 +08:00
zfhai 96c6604543 提交相关代码 2023-12-06 15:14:52 +08:00
mashuai 79bad02eee 测试代码 2023-12-06 14:42:33 +08:00
zfhai 8741259196 提交相关代码 2023-12-06 13:07:00 +08:00
nmy 2272d6df41 【更新】feign抽取 2023-12-06 10:57:43 +08:00
nmy 858633b10d 【更新】feign抽取 2023-12-06 10:37:06 +08:00
nmy b6ab2d0dcd 【新增】代码编写 2023-12-04 17:05:57 +08:00
zfhai 78ed074cbd 修改文件名 2023-12-02 13:09:47 +08:00