Commit Graph

260 Commits

Author SHA1 Message Date
sxu 2488a9611a update profile 2024-11-21 16:39:45 +08:00
sxu a3b1e4714e update table 2024-11-21 14:21:12 +08:00
sxu 298d206270 update config 2024-11-19 17:59:10 +08:00
mashuai 96962230bc 代码优化 2023-12-14 17:53:53 +08:00
nmy 3a3324753a Merge remote-tracking branch 'origin/dev' into dev 2023-12-13 17:29:11 +08:00
nmy 2fea1cc7bd 【更新】代码优化 2023-12-13 17:29:07 +08:00
mashuai 5c9f47a82d 接口调试 2023-12-13 13:51:32 +08:00
zfhai 9c7b61fc39 提交相关代码 2023-12-12 08:56:04 +08:00
bonus 21345aaa5d 修改检验报告、保险信息文件查询,短信配置 2023-12-11 10:51:50 +08:00
mashuai 1e8eaaaaab 大屏接口 2023-12-10 02:47:55 +08:00
sxu 54e167de3f fix 2023-12-10 02:41:46 +08:00
sxu 7b7cca7b7c fix 2023-12-10 02:32:15 +08:00
sxu ba1030d27c Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-10 02:14:28 +08:00
sxu bc1debe0a3 fix 2023-12-10 02:14:09 +08:00
mashuai bd902fd6aa 大屏接口修改 2023-12-10 02:12:35 +08:00
zfhai 6a2141a7e4 提交相关代码 2023-12-10 02:07:33 +08:00
sxu c52de7958f fix 2023-12-10 01:59:50 +08:00
sxu bbaac6afd4 fix 2023-12-10 01:49:38 +08:00
zfhai 86c58c72c4 提交相关代码 2023-12-10 00:32:11 +08:00
nmy e3e65ef562 Merge remote-tracking branch 'origin/dev' into dev 2023-12-10 00:04:45 +08:00
nmy 94c90f0333 【更新】个人中心查询企业数据 2023-12-10 00:04:42 +08:00
sxu 22907ace41 Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-10 00:03:29 +08:00
sxu 8853d69234 fix 2023-12-10 00:03:06 +08:00
nmy 7d60753f10 Merge remote-tracking branch 'origin/dev' into dev 2023-12-09 23:59:11 +08:00
nmy bdc0c3ea2d 【更新】个人中心查询企业数据 2023-12-09 23:59:08 +08:00
sxu ce8e5aac7d Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-09 23:56:13 +08:00
sxu 19057f6058 fix 2023-12-09 23:55:40 +08:00
nmy 10c1848c09 Merge remote-tracking branch 'origin/dev' into dev 2023-12-09 23:53:07 +08:00
nmy c2fa5fab87 【更新】个人中心查询企业数据 2023-12-09 23:53:03 +08:00
zfhai a52d35b367 提交相关代码 2023-12-09 23:36:13 +08:00
mashuai ebf0973264 Merge remote-tracking branch 'origin/dev' into dev 2023-12-09 23:17:15 +08:00
mashuai edfe1dbd25 大屏接口修改 2023-12-09 23:17:04 +08:00
sxu 23d202eec0 Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev 2023-12-09 23:16:41 +08:00
sxu 4a4bdacb8a fix 2023-12-09 23:16:35 +08:00
nmy 5b10a323ae Merge remote-tracking branch 'origin/dev' into dev 2023-12-09 23:06:23 +08:00
sxu a4b700cd3b fix 2023-12-09 22:56:18 +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
sxu cfce3204ba fix 2023-12-09 22:42:05 +08:00
zfhai 51d382382f 提交相关代码 2023-12-09 22:18:00 +08:00
sxu 9a95b50acb fix 2023-12-09 22:09:32 +08:00
sxu f3ba5a3618 fix 2023-12-09 21:05:15 +08:00
zfhai f749219203 提交相关代码 2023-12-09 20:43:17 +08:00
sxu ebd9347a87 fix 2023-12-09 20:04:36 +08:00
sxu 7b1655172a fix 2023-12-09 19:29:31 +08:00
sxu e0fc056b1c fix 2023-12-09 18:19:08 +08:00
sxu ba742a0baf fix 2023-12-09 17:44:13 +08:00
sxu 42ea13df4b fix 2023-12-09 16:53:18 +08:00
mashuai 11ba920fcc 大屏接口修改 2023-12-09 16:37:28 +08:00
mashuai 5d6579fb82 大屏接口修改 2023-12-09 16:37:03 +08:00