Commit Graph
278 Commits
Author SHA1 Message Date
zjf 22de433d1d 采购计划-2 2025-02-10 17:15:55 +08:00
zjf a27a485426 采购计划-1 2025-02-10 12:46:27 +08:00
zjf c8e915382e 超市接口修改 2025-02-08 13:20:31 +08:00
zjf b754a24c8f 超市接口 2025-02-08 12:52:41 +08:00
zjf 89bd014f11 更新工作流模块,修复dept和user接口feign远程调用问题 2025-02-06 17:14:38 +08:00
zjf db7359b046 ... 2025-02-05 18:20:26 +08:00
zjf 0e2f1aa17a Merge remote-tracking branch 'origin/master' 2025-01-24 13:44:39 +08:00
zjf 6f58f60da7 秘钥 2025-01-24 13:44:21 +08:00
dzc daee494a44 feat:钱包表格统计 2025-01-23 20:06:06 +08:00
dzc 0b43f24a20 feat:钱包模块倒序 2025-01-23 18:21:19 +08:00
dzc fbf6d10da8 feat:恢复权限 2025-01-23 17:46:57 +08:00
dzc 76d5d9ad2a feat:硬件模块倒序 2025-01-23 17:15:46 +08:00
dzc f535901e66 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud 2025-01-23 17:00:51 +08:00
dzc 4ba65bfad8 feat:恢复充值金额 2025-01-23 17:00:47 +08:00
zjf a6e1aa9a36 Merge remote-tracking branch 'origin/master' 2025-01-23 16:29:05 +08:00
zjf fddd4fb437 超市 2025-01-23 16:28:46 +08:00
dzc 9d2cf0f5d2 feat:充值/扣款申请自动创建钱包 2025-01-23 16:02:54 +08:00
dzc c9d8c1d52b fix:修改导出模块 2025-01-23 14:26:35 +08:00
dzc b5666485de feat:部门交易金额导出 2025-01-23 14:22:03 +08:00
dzc 7e1be7ef2f feat:部门交易记录 2025-01-23 13:12:31 +08:00
dzc ec5e245fb0 feat:钱包导出 2025-01-23 10:03:52 +08:00
dzc a5bfdd6ced feat:后台退款 2025-01-22 21:04:28 +08:00
dzc 1968a8ff6c Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud 2025-01-22 19:11:50 +08:00
dzc 93fe9c7f91 feat:个人充值、个人消费明细、个人退款导出 2025-01-22 19:11:46 +08:00
zjf 203a62c88b 整改超市 2025-01-22 18:22:41 +08:00
zjf 91393d2af2 Merge remote-tracking branch 'origin/master' 2025-01-22 16:56:28 +08:00
zjf a6f06bcb3e 整改超市 2025-01-22 16:55:49 +08:00
dzc 6d91b9d6fd Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud 2025-01-22 14:53:15 +08:00
dzc bafd38976e feat:设备交易记录、商户交易记录导出 2025-01-22 14:53:11 +08:00
zjf 3a79cd6928 Merge remote-tracking branch 'origin/master' 2025-01-22 12:46:34 +08:00
zjf 8bac74233c 在线超市,库存商品选择分页 2025-01-22 12:46:02 +08:00
dzc 55af27dde1 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud 2025-01-22 11:50:09 +08:00
dzc 83d91ae763 设备交易记录、商户交易记录 2025-01-22 11:50:03 +08:00
zjf e250a1083c Merge remote-tracking branch 'origin/master' 2025-01-21 21:29:13 +08:00
zjf 5a0f9e83a5 浙政钉单点修改 2025-01-21 21:28:03 +08:00
dzc d3926e63ad Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud 2025-01-21 19:12:36 +08:00
dzc c64a291707 feat:充值、消费、退款导出 2025-01-21 19:12:32 +08:00
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