241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zjf	85e388f10f	Merge remote-tracking branch 'origin/master'	2025-01-21 17:43:22 +08:00
zjf	0dee2a34ef	线上超市-1	2025-01-21 17:43:06 +08:00
dzc	41fcc894bb	feat:分配权限	2025-01-21 17:31:38 +08:00
zjf	6c35beee34	移除erp模块，合一起	2025-01-21 16:42:44 +08:00
dzc	71ce1c0620	feat:审核时间	2025-01-21 11:08:14 +08:00
dzc	811f1e79aa	feat:充值流水统计	2025-01-20 20:30:47 +08:00
dzc	f8ecf06bd6	Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud	2025-01-19 17:28:12 +08:00
dzc	072b2223ac	feat:修改打印字体	2025-01-19 17:27:56 +08:00
zjf	db1a69160e	Merge remote-tracking branch 'origin/master'	2025-01-19 17:07:21 +08:00
zjf	d9e6881339	菜品排序	2025-01-19 17:07:04 +08:00
dzc	3231303204	fix:人员查询bug修改	2025-01-19 16:09:32 +08:00
dzc	9db145a4ac	feat:用户根据当前部门和当前部门及其子部门查询	2025-01-19 15:50:36 +08:00
dzc	91d310fa04	饭卡查询	2025-01-19 15:34:49 +08:00
dzc	29e85b98af	feat:最多只能上传3张人脸数据	2025-01-19 12:24:19 +08:00
dzc	352bacb393	Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud	2025-01-19 11:54:02 +08:00
dzc	07084b07c9	钱包、硬件权限	2025-01-19 11:53:58 +08:00
zjf	6089c0251e	菜品分类接口修改	2025-01-17 14:55:45 +08:00
zjf	38de9915e3	Merge remote-tracking branch 'origin/master'	2025-01-17 13:44:02 +08:00
zjf	b513b2fb64	用户导入	2025-01-17 13:43:45 +08:00
dzc	f1d57d6d51	Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud	2025-01-17 13:19:39 +08:00
dzc	4c53c8360e	fix:硬件模块bug	2025-01-17 13:19:35 +08:00
zjf	88c65f60b8	Merge remote-tracking branch 'origin/master'	2025-01-17 10:06:58 +08:00
zjf	29966ce9e2	修改每日选择菜品接口	2025-01-17 10:06:38 +08:00
dzc	a6a407e87a	Merge branches 'master' and 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud	2025-01-16 18:07:50 +08:00
dzc	12e72fb568	11	2025-01-16 18:07:47 +08:00
zjf	557d3e73e4	修改ad机菜谱接口	2025-01-16 18:06:46 +08:00
zjf	5738d0cf58	Merge remote-tracking branch 'origin/master'	2025-01-16 18:02:20 +08:00
zjf	d97820eb18	修改ad机菜谱接口	2025-01-16 18:02:00 +08:00
dzc	e8fcbeecfa	Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud	2025-01-16 16:23:23 +08:00
dzc	46769060fc	fix:人脸	2025-01-16 16:23:20 +08:00
zjf	f104dc7fb0	修改ad机菜谱接口	2025-01-16 16:06:17 +08:00
zjf	7b1ae51944	Merge remote-tracking branch 'origin/master'	2025-01-16 15:46:37 +08:00
zjf	5d6f256134	修改ad机菜谱接口	2025-01-16 15:45:28 +08:00
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