Commit Graph

165 Commits

Author SHA1 Message Date
sxu a926523f28 防重复 2024-08-19 12:22:38 +08:00
sxu 1c01c7dc38 防重复 2024-08-19 10:59:18 +08:00
sxu 14bd9d1642 Merge remote-tracking branch 'origin' into macode20240818 2024-08-19 10:54:45 +08:00
sxu 09a2c9e855 app查看公告 2024-08-19 09:59:28 +08:00
sxu 3465f8e6fa 防重复提交 2024-08-19 09:29:36 +08:00
sxu a5b647990f 补充属性 2024-08-19 08:46:41 +08:00
sxu bb561624e5 编码设备库存 2024-08-18 09:28:10 +08:00
sxu ee70d65a5c 编码设备库存 2024-08-18 09:26:06 +08:00
sxu 1d273580e5 编码设备库存 2024-08-18 09:03:29 +08:00
sxu 7764b09927 change profile 2024-08-16 19:19:11 +08:00
sxu 854a9b3dc4 change profile 2024-08-16 19:12:50 +08:00
liang.chao 17f52add11 Merge branch 'lc20240816' 2024-08-16 17:21:55 +08:00
liang.chao b07473f2ea 结算代码提交 2024-08-16 17:21:36 +08:00
liang.chao 8f0ae7aec0 Merge branch 'lc20240816' 2024-08-16 17:20:55 +08:00
liang.chao c9b28aff01 结算代码提交 2024-08-16 17:20:31 +08:00
liang.chao 6ef5b3693a Merge branch 'lc20240816' 2024-08-16 15:55:00 +08:00
liang.chao 0247e3e407 结算代码提交 2024-08-16 15:54:39 +08:00
liang.chao 12a953ea90 Merge branch 'lc20240816' 2024-08-16 14:24:38 +08:00
liang.chao 012ae95238 结算代码提交 2024-08-16 14:23:52 +08:00
sxu f98f52a118 backup ng 2024-08-16 13:53:25 +08:00
liang.chao 5b1ff9ee80 依赖提交 2024-08-16 10:50:14 +08:00
liang.chao 5271ebe0bd Merge branch 'lc20240808' 2024-08-16 10:48:47 +08:00
liang.chao 16f03e826c 结算功能代码提交 2024-08-16 10:42:13 +08:00
sxu f0256a5ce1 fix path 2024-08-15 15:45:42 +08:00
sxu 26940845a5 Merge branch 'master' of http://192.168.0.56:3000/bonus/cqdevicemgt 2024-08-15 15:10:13 +08:00
sxu 194df04b64 删除前端代码 2024-08-15 15:09:58 +08:00
15856 581ddd9582 对获取用户信息进行优化 2024-08-15 15:03:26 +08:00
15856 67b80c13f3 重庆bug修复 2024-08-15 14:37:33 +08:00
15856 e95b3d35ff ito测试问题修复,app预警内容推送 2024-08-15 14:36:09 +08:00
liang.chao 4efbea7893 Merge branch 'lc20240808' 2024-08-15 14:32:57 +08:00
liang.chao fde16015f8 结算功能代码提交 2024-08-15 14:30:15 +08:00
sxu 8b932e9f6d 结算优化 2024-08-15 14:07:24 +08:00
sxu 0d2c680eac 结算 2024-08-15 09:25:24 +08:00
sxu 69c3b7a0fb 结算优化 2024-08-14 18:25:32 +08:00
liang.chao 699e66ee32 Merge branch 'master' into lc20240808 2024-08-13 10:57:45 +08:00
liang.chao c42d2099d1 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/cqdevicemgt into dev-cq-bug 2024-08-13 10:53:35 +08:00
sxu 5dae109c54 fix bug 2024-08-13 10:44:27 +08:00
liang.chao 340acdd299 Revert "fix bug"
This reverts commit d2098dab1b.
2024-08-13 10:37:46 +08:00
liang.chao d2098dab1b fix bug 2024-08-13 10:33:38 +08:00
liang.chao a7991c4005 Merge branch 'master' into dev-cq-bug 2024-08-13 10:28:28 +08:00
liang.chao ce2396aafc 短信功能完善 2024-08-13 10:27:54 +08:00
liang.chao c0fd7885dc 短信功能完善 2024-08-13 10:12:37 +08:00
liang.chao ee396ed430 结算功能完善 2024-08-13 09:07:25 +08:00
sxu 5f45a1eb87 合并配件导入问题 2024-08-12 18:25:11 +08:00
BianLzhaoMin 5aae85cadb bug修改 2024-08-12 17:38:28 +08:00
BianLzhaoMin 3619269ee4 代码优化 2024-08-12 13:11:46 +08:00
liang.chao a2baadf840 结算功能完善 2024-08-09 17:03:26 +08:00
liang.chao 84e3e319fa Merge branch 'master' into lc20240808 2024-08-09 11:00:34 +08:00
liang.chao 7506398006 结算功能完善 2024-08-09 10:59:52 +08:00
sxu ff5db6cbc5 update path 2024-08-09 09:46:45 +08:00