zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
188 Commits 2 Branches 0 Tags
ac830c925ea2c987acde3e0f8cc7764cfe6d0f45
Commit Graph
188 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
dzc ac830c925e feat:硬件分组查询 2025-01-14 17:26:56 +08:00
dzc 4dfd2bcc75 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud 2025-01-14 17:07:38 +08:00
dzc 7b05ba6711 feat:硬件设备分组 2025-01-14 17:07:34 +08:00
zjf aeae1fb48f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java
 2025-01-14 16:32:45 +08:00
zjf 2333d0d28f 新增每日菜谱选择接口 2025-01-14 16:29:43 +08:00
dzc 79be68e8dc feat:人脸下发 2025-01-14 15:27:45 +08:00
dzc a49b913e9f feat:人脸同步 2025-01-14 14:03:37 +08:00
dzc b5262330a6 fix:下发菜谱修改 2025-01-14 12:57:24 +08:00
dzc ecf050204a faet:食堂下发 2025-01-14 11:34:32 +08:00
dzc 80276298c3 feat:批量充值bug 2025-01-14 10:38:00 +08:00
dzc e43533e6b5 fix:库存 2025-01-14 10:07:04 +08:00
dzc 5f3bd682b9 fix:退库存bug 2025-01-14 09:47:34 +08:00
dzc 7d038b41ef feat:退款退库存 2025-01-14 09:33:09 +08:00
dzc 1327fac21e feat:设备全系 2025-01-13 19:24:05 +08:00
dzc 8d4c772ee8 feat:钱包权限 2025-01-13 18:37:30 +08:00
dzc 732ee6b6fd Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud 2025-01-13 16:54:41 +08:00
dzc 82ed9bd2cc feat：添加mqtt服务 2025-01-13 16:54:37 +08:00
zjf 5e8f5a2e2e 添加菜品返回字段 2025-01-13 15:47:13 +08:00
zjf 5e454dfa0c 修改超市库存接口 2025-01-13 15:40:44 +08:00
zjf cd5b5d1907 修改库存接口 2025-01-13 15:29:23 +08:00
dzc fdf6dc8072 11 2025-01-13 14:17:21 +08:00
dzc d6d36d689f feat:批量充值统计 2025-01-13 11:00:47 +08:00
dzc d9e8663468 feat：审批判断 2025-01-12 21:03:34 +08:00
dzc 01b0623913 feat:审批 2025-01-12 20:50:10 +08:00
dzc 15509313fc feat:是被食堂，线上线下订单 2025-01-11 18:08:59 +08:00
dzc 792da4ce7b feat:适配食堂线下商品 2025-01-11 17:41:12 +08:00
dzc 4daf1069a9 1 2025-01-11 17:32:28 +08:00
dzc a369b46c9d feat:兼容食堂线上、线下商品 2025-01-11 17:31:16 +08:00
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