Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• daf6767bbd 整理 zjf 2025-01-21 16:54:02 +08:00
• 5b8679256a 整理 zjf 2025-01-21 16:47:19 +08:00
• 573d25adcc Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud dzc 2025-01-21 11:07:48 +08:00
• eafe75484f feat:审核时间 dzc 2025-01-21 11:07:45 +08:00
• 738d76247d 用户管理重置查询时取消部门树形数据选中的状态 ctw 2025-01-21 09:52:53 +08:00
• e55aadc127 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud dzc 2025-01-21 09:11:29 +08:00
• bb0317fbc8 feat:充值流水分页 dzc 2025-01-21 09:11:25 +08:00
• fdde0bee85 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-20 21:04:29 +08:00
• cad822e674 移除终止流程 ctw 2025-01-20 21:04:20 +08:00
• dd6082e521 feat:充值流水统计 dzc 2025-01-20 20:30:36 +08:00
• 1832ab74d5 feat:申请按钮权限 dzc 2025-01-20 17:06:04 +08:00
• d847967ef8 修改 ctw 2025-01-20 16:05:30 +08:00
• 378bc6a659 修改 ctw 2025-01-20 16:02:59 +08:00
• db6b0ac96d Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud dzc 2025-01-20 15:57:28 +08:00
• eb295d35f9 feat:申请备注 dzc 2025-01-20 15:56:50 +08:00
• 6c2e9b60a4 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-20 15:11:48 +08:00
• ad53819215 修改 ctw 2025-01-20 15:11:43 +08:00
• fa7829c6ab Merge remote-tracking branch 'origin/master' zjf 2025-01-20 11:27:09 +08:00
• f23553686f 登录页 zjf 2025-01-20 11:26:35 +08:00
• 491eaed6ae Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-20 10:29:54 +08:00
• fad6c2a6d3 钱包数据表格行尾合计 ctw 2025-01-20 10:29:47 +08:00
• 9bf7f7af6d Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud dzc 2025-01-19 21:19:30 +08:00
• ebff17f4ab fix：修改 dzc 2025-01-19 21:19:24 +08:00
• 8aeae2cb89 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-19 17:42:02 +08:00
• 6dfeb5a9e2 每次菜品选择添加点击行选择 ctw 2025-01-19 17:41:56 +08:00
• e2988f7354 fix:去掉邮箱必填 dzc 2025-01-19 16:43:12 +08:00
• c0d9b6a7b1 fix:人员查询bug修改 dzc 2025-01-19 16:18:27 +08:00
• 238776cd2c feat:用户根据当前部门和当前部门及其子部门查询 dzc 2025-01-19 15:50:26 +08:00
• 26045f9a28 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-19 15:34:51 +08:00
• 7f48dbbc1c 添加查全部 ctw 2025-01-19 15:34:44 +08:00
• 3c349ac1e3 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud dzc 2025-01-19 15:34:35 +08:00
• c4f10ac9fe feat:配置权限 dzc 2025-01-19 15:34:30 +08:00
• fe2884f161 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-19 13:37:38 +08:00
• 1beb70d4aa 添加按钮权限 ctw 2025-01-19 13:37:13 +08:00
• 7d780d9f0c Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud dzc 2025-01-19 11:55:12 +08:00
• ef3dea40fa feat:钱包、设备权限 dzc 2025-01-19 11:54:56 +08:00
• 0fa67d4d02 修改菜品分类接口 ctw 2025-01-17 15:00:14 +08:00
• ea2daab109 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud zjf 2025-01-17 14:17:31 +08:00
• ef65369441 env zjf 2025-01-17 14:17:14 +08:00
• 373de198e4 修改每日菜谱问题和调整首页布局以及移除不必要的导入 ctw 2025-01-17 14:15:01 +08:00
• 611f1d634d 每日菜品选择改为分页并保存勾选状态 ctw 2025-01-16 18:24:43 +08:00
• 3872bfd959 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-16 12:13:34 +08:00
• cad68a0301 修改菜谱选择商品问题 ctw 2025-01-16 12:13:28 +08:00
• 2b52329aaf Merge branches 'master', 'master' and 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud dzc 2025-01-16 12:08:20 +08:00
• 8acb5144fb feat:打印 dzc 2025-01-16 12:08:16 +08:00
• 2c6c5214ed Merge remote-tracking branch 'origin/master' zjf 2025-01-16 11:15:13 +08:00
• e76e3cc77c 整理 zjf 2025-01-16 11:14:50 +08:00
• 03f52b4a57 修改每日菜品删除提示。页面加载默认获取当日数据。 ctw 2025-01-16 10:18:43 +08:00
• b6c6174c35 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-16 09:54:48 +08:00
• 628fa5bfdc 使用图片懒加载 ctw 2025-01-16 09:54:43 +08:00
• ff545909c0 使用图片懒加载 ctw 2025-01-16 09:33:55 +08:00
• b6f313ed78 样式修改 ctw 2025-01-15 22:03:48 +08:00
• 439eea31b6 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-15 20:00:40 +08:00
• 1d6f7b8db7 每日菜谱添加loading效果，默认选中当天 ctw 2025-01-15 20:00:36 +08:00
• 2acb0eb403 11 dzc 2025-01-15 18:45:33 +08:00
• 20637dc1a9 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-15 18:09:44 +08:00
• 88e8062a19 修改每日菜谱 ctw 2025-01-15 18:09:19 +08:00
• 1f78595570 feat:硬件分组绑定 dzc 2025-01-15 18:07:17 +08:00
• 0c5a8d0625 feat:激活 dzc 2025-01-15 14:10:01 +08:00
• 2adc746e87 fix:硬件核销流程 dzc 2025-01-15 10:54:52 +08:00
• 6e32c1d4d7 feat:硬件分组查询 dzc 2025-01-14 17:27:15 +08:00
• 3262e2cbd2 Merge branches 'master' and 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud dzc 2025-01-14 16:09:21 +08:00
• 97036f0f68 feat:全局人脸 dzc 2025-01-14 16:09:18 +08:00
• 219272d576 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-14 13:36:54 +08:00
• 5358524146 样式微调整 ctw 2025-01-14 13:36:42 +08:00
• bac2067c08 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud dzc 2025-01-14 11:34:56 +08:00
• 81d27be654 fix:导入bug dzc 2025-01-14 11:34:52 +08:00
• 600ad4f970 样式微调 ctw 2025-01-14 11:32:10 +08:00
• d660e55f26 修改每日菜品删除接口 ctw 2025-01-14 11:08:41 +08:00
• e5b9768998 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-14 10:50:34 +08:00
• adf10717ea 微调每日菜谱菜品样式 ctw 2025-01-14 10:50:23 +08:00
• 8d0c0bfaaf Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud dzc 2025-01-14 09:32:43 +08:00
• a23504355b fix:商户bug修改 dzc 2025-01-14 09:32:39 +08:00
• b807e92744 添加每日菜品时可删除菜品项 ctw 2025-01-14 09:13:05 +08:00
• adcc3888e7 每日菜谱添加菜品类别和价格 ctw 2025-01-13 19:39:35 +08:00
• 62f19c9e4f 超市相关表单清除空字符输入，修改数字输入的格式 ctw 2025-01-13 18:21:52 +08:00
• aafc93ba61 超市增加表单输入空格检查和数字检查 ctw 2025-01-13 16:55:56 +08:00
• 92c5680ed7 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud ctw 2025-01-13 16:03:20 +08:00
• 7f09bed91d 食堂的所有表单校验修改 ctw 2025-01-13 16:03:13 +08:00
• 6ceaa905cb 整理 zjf 2025-01-13 15:48:39 +08:00
• a094b69647 1 dzc 2025-01-13 10:59:27 +08:00
• 5765c40a75 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud dzc 2025-01-13 10:57:49 +08:00
• 670d81415d feat:批量充值统计 dzc 2025-01-13 10:57:44 +08:00
• 8af084c695 Merge remote-tracking branch 'biz-pc-cloud/master' ctw 2025-01-13 10:48:51 +08:00
• d5b5c463e8 1 ctw 2025-01-13 10:48:00 +08:00
• ab7ca3fc04 1 ctw 2025-01-12 21:59:44 +08:00
• de2c93c4c8 Merge remote-tracking branch 'biz-pc-cloud/master' ctw 2025-01-12 21:58:41 +08:00
• 33d90c45b0 修改每日菜谱 ctw 2025-01-12 21:51:34 +08:00
• cd86ae5521 feat:审批 dzc 2025-01-12 20:49:49 +08:00
• 002f8ad6b1 修改每日菜谱 ctw 2025-01-12 15:42:17 +08:00
• f5c3e0b0ea feat:订单页面 dzc 2025-01-11 18:08:01 +08:00
• e572860a0c Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud dzc 2025-01-11 15:53:45 +08:00
• 087d49c6ac fix：硬件管理 dzc 2025-01-11 15:53:42 +08:00
• b4ff730fc8 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud ctw 2025-01-11 12:08:30 +08:00
• 29e9f30eb7 添加首页的导航菜单是否显示 ctw 2025-01-11 12:08:02 +08:00
• 4d2494aab0 整理 zjf 2025-01-10 13:22:43 +08:00
• 9f73360b42 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud zjf 2025-01-10 12:36:06 +08:00
• 7ffa55a2d6 env zjf 2025-01-10 12:35:24 +08:00
• 5f757796c8 feat:商户权限 dzc 2025-01-10 11:23:44 +08:00
• 6fefe9d69c Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud dzc 2025-01-09 20:51:28 +08:00