208 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
dzc	64da3a89f5	Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud	2025-01-16 15:34:33 +08:00
dzc	bc0217e01d	fix:人脸bug修改	2025-01-16 15:34:28 +08:00
zjf	3e5c0d9117	Merge remote-tracking branch 'origin/master'	2025-01-16 15:33:57 +08:00
zjf	0030c11466	修改ad机菜谱接口	2025-01-16 15:33:43 +08:00
dzc	c036fdf744	Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud	2025-01-16 12:08:00 +08:00
dzc	62a4eac910	feat:全局人脸	2025-01-16 12:07:56 +08:00
zjf	144670b00b	修改菜谱选择商品问题	2025-01-16 11:36:29 +08:00
dzc	f9c6d9f193	feat:后台打印	2025-01-15 22:05:20 +08:00
dzc	f122598825	Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud	2025-01-15 17:01:27 +08:00
dzc	33bec4fb22	feat:部门硬件分组	2025-01-15 17:01:22 +08:00
zjf	a8ba621d7e	Merge remote-tracking branch 'origin/master'	2025-01-15 16:50:50 +08:00
zjf	2346dab0d5	修改	2025-01-15 16:50:24 +08:00
dzc	c67f020a6a	feat:钱包二维码适配	2025-01-15 15:42:57 +08:00
dzc	395318b34f	feat:激活	2025-01-15 14:10:25 +08:00
dzc	d4e424e39d	feat:钱包冻结流程	2025-01-15 13:53:27 +08:00
dzc	93add403c7	fix:硬件核销流程	2025-01-15 10:54:15 +08:00
dzc	eca9919674	Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud	2025-01-14 17:33:25 +08:00
dzc	b90e25f350	fix:修改	2025-01-14 17:33:21 +08:00
zjf	7f4f812605	Merge remote-tracking branch 'origin/master'	2025-01-14 17:31:24 +08:00
zjf	f24240bac1	新增每日菜谱选择接口	2025-01-14 17:31:05 +08:00
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