Commit Graph
160 Commits
Author SHA1 Message Date
dzc 46d4757f55 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud 2025-01-11 15:53:16 +08:00
dzc 08373b91cd feat:硬件查询用户 2025-01-11 15:53:13 +08:00
zjf 2a83e50b7d ... 2025-01-10 17:53:12 +08:00
dzc f4a229f4f9 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud 2025-01-10 14:16:12 +08:00
dzc 3f8f24c1ed feat:硬件登录 2025-01-10 14:16:09 +08:00
zjf cae0e11424 修复菜品下拉 2025-01-10 13:02:34 +08:00
zjf 2aa1d38e3d Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud 2025-01-10 11:27:48 +08:00
dzc 92b8cc1a14 11 2025-01-10 11:26:59 +08:00
dzc e92a6a58f3 feat:商户权限 2025-01-10 11:23:33 +08:00
zjf c5f91d5cb8 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud 2025-01-10 11:12:01 +08:00
dzc 1a0e716230 feat:钱包二维码 2025-01-10 11:11:26 +08:00
zjf 77da090d4e Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud 2025-01-10 11:05:22 +08:00
dzc c44bfe4151 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud 2025-01-09 20:51:05 +08:00
dzc fdab8dfd7a feat:二维码 2025-01-09 20:51:02 +08:00
zjf 4caa61ae79 erp 2025-01-09 16:38:22 +08:00
zjf ad12098ca6 食堂数据权限 2025-01-09 16:33:34 +08:00
zjf 558be27bce 超市数据权限 2025-01-09 16:21:35 +08:00
dzc 872ebe235f Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud 2025-01-09 14:04:16 +08:00
dzc 02959bf983 feat:退款 2025-01-09 14:04:12 +08:00
zjf 474a55483f Merge remote-tracking branch 'origin/master' 2025-01-09 14:01:13 +08:00
zjf 770df7062f 修复超市spu列表 2025-01-09 14:00:56 +08:00
dzc 8f77b9e795 fix:商户下拉 2025-01-09 13:27:19 +08:00
dzc 37a88b1d53 feat:h5退款接口 2025-01-09 13:02:18 +08:00
zjf 360b9015c6 单点 2025-01-09 12:34:32 +08:00
zjf cf4b5e561e 单点 2025-01-09 12:07:17 +08:00
dzc 964b9e87f6 feat:售后页面 2025-01-09 10:52:43 +08:00
dzc 2b25aafc15 feat:下单bug 2025-01-09 09:21:12 +08:00
dzc a932190426 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud 2025-01-08 18:08:28 +08:00
dzc bd69bf6e71 feat:下单bug 2025-01-08 18:08:24 +08:00
zjf a4c45192c3 详情接口 2025-01-08 18:06:49 +08:00
zjf 2ebaf4a211 Merge remote-tracking branch 'origin/master' 2025-01-08 17:54:28 +08:00
zjf b6b39120d5 移除金额自动转换 2025-01-08 17:54:13 +08:00
dzc 273d753211 feat:价格转换注解 2025-01-08 16:53:16 +08:00
dzc 3c6a93e8e9 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud 2025-01-08 16:48:15 +08:00
dzc 66e270b371 feat:退款审批 2025-01-08 16:48:11 +08:00
zjf 1bd1df932b 移除金额自动转换 2025-01-08 16:46:39 +08:00
zjf a7ab8dcf99 Merge remote-tracking branch 'origin/master' 2025-01-08 16:30:00 +08:00
zjf 5ff24ff832 每日菜谱app接口 2025-01-08 16:29:37 +08:00
dzc 06c562e861 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud 2025-01-08 16:22:30 +08:00
dzc f0818dc99d feat:退款 2025-01-08 16:22:26 +08:00
zjf 27ddbdd5b7 修改食堂 2025-01-08 14:40:20 +08:00
zjf 67dc0fdd98 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteOnlineCanteenSpuService.java
2025-01-08 14:34:40 +08:00
zjf 4936b59d70 修改食堂 2025-01-08 14:33:51 +08:00
dzc f5cc8b27e1 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud 2025-01-08 14:00:04 +08:00
dzc f0b5da5858 feat:H5购物车接口 2025-01-08 14:00:01 +08:00
zjf d7d73c863b 超市接口 2025-01-08 12:24:41 +08:00
zjf c2e0d8c31d 超市接口 2025-01-08 12:23:10 +08:00
zjf 1e9b646752 Merge remote-tracking branch 'origin/master' 2025-01-07 19:01:48 +08:00
zjf b5ac643785 超市接口 2025-01-07 19:01:30 +08:00
dzc 449740d0cf feat:充值、消费、退款记录 2025-01-07 18:21:59 +08:00