Commit Graph
602 Commits
Author SHA1 Message Date
zjf 5bf5aa64e9 Merge remote-tracking branch 'origin/master' 2025-03-25 17:29:30 +08:00
zjf 3769d265b1 feat:食堂新增字段是否显示 2025-03-25 17:29:12 +08:00
weiwei 3a2e4342be Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-25 16:04:02 +08:00
weiwei 2a21372bee 采购管理和零售管理相关的详情查看和打印预览 2025-03-25 16:03:47 +08:00
zjf 2c0430b365 feat:工作流引入详情路由字段,食堂新增字段是否显示 2025-03-25 15:07:20 +08:00
dzc d79ff80e39 feat:商户导出权限 2025-03-25 10:42:53 +08:00
dzc b33aec5aa3 feat:设备交易记录、商户交易记录查询逻辑修改 2025-03-25 10:22:30 +08:00
dzc 4026400ffc feat:设备交易记录 2025-03-24 19:30:39 +08:00
dzc 4b2c247082 fix:是否同步到正元权限 2025-03-24 18:57:07 +08:00
dzc 49694f7489 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-24 18:55:09 +08:00
dzc 854deda9b4 11 2025-03-24 18:55:04 +08:00
zjf ff6cd0cc32 Merge remote-tracking branch 'origin/master' 2025-03-24 18:15:09 +08:00
zjf 3e6f481110 feat:引入会议 2025-03-24 18:14:50 +08:00
dzc e2595abf94 feat:每日菜谱下拉只显示食堂 2025-03-24 16:46:03 +08:00
dzc d6c0c52885 feat:h5增加是否显示店铺 2025-03-24 11:31:57 +08:00
dzc 7c3ae331d6 11 2025-03-23 15:42:09 +08:00
dzc ef7f19c07e feat:每日菜谱只筛选食堂 2025-03-23 15:30:24 +08:00
dzc 5bb6c9731b 11 2025-03-22 14:54:16 +08:00
zjf d020ea2da5 Merge remote-tracking branch 'origin/master' 2025-03-21 17:50:35 +08:00
zjf 9dd493e6c7 整理食堂模块,引入意见反馈 2025-03-21 17:50:16 +08:00
weiwei fe3054d814 修改 2025-03-21 17:41:44 +08:00
weiwei 7bfc398c59 添加正元同步表单项 2025-03-21 17:29:51 +08:00
weiwei 9969dc2b41 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-21 16:05:09 +08:00
weiwei bb7422bb9b 修复用户审批开始处理按钮显示 2025-03-21 16:04:02 +08:00
dzc 653d3fc086 feat:支付方式交易记录导出 2025-03-21 15:40:47 +08:00
dzc 8dd91a2888 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-21 15:09:05 +08:00
dzc 39bfeb1fde create:支付方式交易记录 2025-03-21 15:08:55 +08:00
zjf 6ac9382e8d Merge remote-tracking branch 'origin/master' 2025-03-21 13:51:34 +08:00
zjf e203efd0f0 整理 2025-03-21 13:51:14 +08:00
dzc 796714a377 11 2025-03-21 12:50:24 +08:00
dzc a7544976af feat:钱包记账扣款记录 2025-03-21 11:28:30 +08:00
zjf 76e4eb0ce8 Merge remote-tracking branch 'origin/master' 2025-03-20 17:30:54 +08:00
zjf 5364ebcf2d 引入失物招领,维修工单 2025-03-20 17:30:25 +08:00
dzc 9906c7998e Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-20 17:09:13 +08:00
dzc 4518749f53 feat:正元修改 2025-03-20 17:09:08 +08:00
weiwei aec1959b83 修改 2025-03-20 16:37:43 +08:00
zjf ae84ffef91 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-20 12:08:28 +08:00
zjf a98952e534 .. 2025-03-20 12:08:14 +08:00
weiwei 1fcbd10712 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-19 20:09:48 +08:00
weiwei 4a640f6279 超市相关调整 2025-03-19 20:08:17 +08:00
zjf a395c82052 修改 2025-03-19 13:49:53 +08:00
zjf 3878d4e10d 修改 2025-03-18 16:36:18 +08:00
weiwei f726bb11fb 滚动 2025-03-17 19:02:12 +08:00
weiwei 47aa0e7ba8 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-17 16:11:23 +08:00
weiwei e89adb2231 库存盘点 2025-03-17 16:10:09 +08:00
weiwei f00170ba5c bug修复 2025-03-17 16:09:35 +08:00
dzc 84ac98a755 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-17 09:25:36 +08:00
dzc e5b3c79cce 11 2025-03-17 09:25:14 +08:00
weiwei fed99fb0a7 每日菜品独立页 2025-03-16 19:58:52 +08:00
weiwei c1893adb3c 库存盘点计算 2025-03-14 19:32:52 +08:00