Commit Graph

Select branches

Hide Pull Requests

dwb

dwb_test

gaohao

gyq

master

multi-store

wwz

wwz-master

ymf

ymf_test

Mono Color

• 723902ac09 fix: 修复一级菜单问题 YeMingfei666 2025-09-10 14:11:41 +0800
• 83eaf368ca add: 优化 gyq 2025-09-10 14:11:36 +0800
• 0499e36a5b fix: 修改路由模式 YeMingfei666 2025-09-10 14:11:24 +0800
• 075c39d2b7 Merge branch 'gyq' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into ymf YeMingfei666 2025-09-10 13:50:39 +0800
• 06cd932eda fix: 修复一级菜单问题 YeMingfei666 2025-09-10 13:49:41 +0800
• 2ddddeed3c add: 新增营销中心新版列表页面 gyq 2025-09-10 13:38:16 +0800
• 557ca477d9 Merge branch 'ymf' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into gyq gyq 2025-09-09 18:12:29 +0800
• 4d5e53f0d3 docs: 修改正式宝塔链接 multi-store YeMingfei666 2025-09-09 15:24:31 +0800
• 30faee9dac add: 多门店代码合并 YeMingfei666 2025-09-09 15:08:32 +0800
• 8e84185962 add: tetst gyq 2025-09-09 10:26:23 +0800
• 316b7fe059 fix: 提交测试 YeMingfei666 2025-09-09 10:21:46 +0800
• f602a7778d fix: 角色管理修改 YeMingfei666 2025-09-09 10:20:11 +0800
• ceaf5fd2d5 Merge branch 'ymf' of e.coding.net:g-cphe0354/cashier/cashier-web into gyq gyq 2025-07-01 09:59:30 +0800
• 863bab3eba fix: 菜单管理增加微信小程序图标，修复部分问题 YeMingfei666 2025-05-30 18:30:18 +0800
• 352795d52f fix: 删除订单管理添加按钮 YeMingfei666 2025-05-30 18:29:40 +0800
• 9f2322889c feat(admin): 优化管理端台桌信息 gyq 2025-05-28 10:36:08 +0800
• 2cde04720d fix: 修复商品分组选择商品未回显已选中商品问题以及重置问题 YeMingfei666 2025-05-06 16:10:39 +0800
• 73e20ad617 feat: 代码合并 ymf_test YeMingfei666 2025-04-22 10:17:05 +0800
• 21eda68ab0 fix: 代码合并冲突解决 YeMingfei666 2025-04-22 10:16:48 +0800
• f5ff208fd6 fix: 代码合并冲突解决 YeMingfei666 2025-04-22 10:14:20 +0800
• cfc925e55c fix: 代码合并 YeMingfei666 2025-04-22 10:14:05 +0800
• 258704dea2 feat: 商品列表增加库存开关展示 YeMingfei666 2025-04-22 10:02:47 +0800
• 22b98fd697 fix: 修复扫码支付完成回调无响应问题 YeMingfei666 2025-04-22 09:49:57 +0800
• 593f5693ef fix: 合并代码-修改空格 dwb_test duan 2025-04-21 15:31:04 +0800
• 2993c1375f fix: 合并代码 duan 2025-04-21 15:26:19 +0800
• ddf7045346 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test YeMingfei666 2025-04-21 11:05:49 +0800
• 65c1aef7bf feat: 增加代课下单商品不在可售时间内判断，增加购物车提示库存不足处理，增加购物车编辑增加参数起售数量 YeMingfei666 2025-04-21 11:04:24 +0800
• a6bca24c1a fix: 修改时间字段 duan 2025-04-18 18:00:00 +0800
• e9a606c71e fix: 商品列表库存修改，没提交成功不修改表格 duan 2025-04-17 13:41:02 +0800
• 2602916201 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test YeMingfei666 2025-04-16 17:31:49 +0800
• 8a9cca4ee2 feat: 代客下单增加商品编辑时商品不足提示 YeMingfei666 2025-04-16 17:30:13 +0800
• 90d90c55b8 feat: 代客下单商品列表增加库存不足图标，重新排序商品不同状态展示 YeMingfei666 2025-04-16 17:26:31 +0800
• beade81a68 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test YeMingfei666 2025-04-16 09:45:29 +0800
• b9e5713fc1 fix: 商品售罄，不可售，下架图标更新 YeMingfei666 2025-04-16 09:44:25 +0800
• 9b6dd9f0da Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test YeMingfei666 2025-04-16 09:38:14 +0800
• d93a8eed25 feat: readme增加本地linux连接相关文档 YeMingfei666 2025-04-16 09:37:36 +0800
• f4b939433d fix: 代码合并冲突解决 YeMingfei666 2025-04-16 09:28:58 +0800
• 0563e07cdb fix: 修改商品售罄判断增加判断条件（商品开启库存切且库存<=0） YeMingfei666 2025-04-15 18:56:17 +0800
• 0a73635b78 fix: 合并冲突 duan 2025-04-15 16:29:40 +0800
• 2b8746abe4 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web duan 2025-04-15 14:26:45 +0800
• d675341444 fix: 修改商品分组编辑时间的问题 duan 2025-04-15 14:26:35 +0800
• 4f987ae3d2 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test YeMingfei666 2025-04-15 11:13:33 +0800
• b477422142 fix: 删除历史订单时提示不可取消也获取一下历史订单数据 YeMingfei666 2025-04-15 11:10:02 +0800
• 0d495c20ef feat: 耗材报损 wwz wwz 2025-04-15 10:41:12 +0800
• c093c618b2 Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz wwz 2025-04-12 13:45:46 +0800
• 7fb9f30c45 feat: 更新通知中心1 wwz 2025-04-12 13:45:35 +0800
• 901d56b648 Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store gaohao GaoHao 2025-04-12 11:02:06 +0800
• 05aaa2fd64 feat: 登录类型增加 GaoHao 2025-04-12 11:01:38 +0800
• 2fe5e38e85 Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store wwz 2025-04-12 11:01:21 +0800
• 1d848b7227 feat: 更新通知中心 wwz 2025-04-12 11:01:17 +0800
• 784941f558 feat: 商品管理，商品规格，添加规格时，不能删除规格值 dwb duan 2025-04-12 09:55:17 +0800
• ce3b817e42 feat: 商品报损更新列表 GaoHao 2025-04-12 09:42:12 +0800
• b92f39fe89 feat: 增加权限校验 GaoHao 2025-04-11 18:26:10 +0800
• cc13161f16 feat: 商品同步规则优化 GaoHao 2025-04-11 17:57:35 +0800
• 688f30635b feat: 同步规则优化 GaoHao 2025-04-11 17:25:02 +0800
• 85eba13919 Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store GaoHao 2025-04-11 16:53:19 +0800
• c956972cb3 feat: 同步规格优化 GaoHao 2025-04-11 16:53:14 +0800
• 583b79bc8f fix: 代码合并 YeMingfei666 2025-04-11 16:51:59 +0800
• 53fdd79a2e fix: crud组件列表操作栏和列表顶部操作栏增加hidden隐藏字段 YeMingfei666 2025-04-11 16:48:06 +0800
• 6df2050d2b Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store GaoHao 2025-04-11 15:50:32 +0800
• 331f438f99 feat: 同步规格优化 GaoHao 2025-04-11 15:50:15 +0800
• ef600c9e3c Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz wwz 2025-04-11 15:47:01 +0800
• 9a0170471a feat: 角色级别 wwz 2025-04-11 15:46:48 +0800
• 8fd3565bac feat: 增加同步规则 GaoHao 2025-04-11 14:57:26 +0800
• 04ae1c342b feat: 销售统计分类筛选隐藏，商品同步优化 GaoHao 2025-04-11 11:34:10 +0800
• 273684678b Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test YeMingfei666 2025-04-11 09:57:32 +0800
• fdc1933bbe fix: 修复时间crud搜索时间筛选类型，未配置showFastEdit为true时不显示问题 YeMingfei666 2025-04-11 09:56:42 +0800
• 299c6327b7 Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store GaoHao 2025-04-11 09:47:22 +0800
• cf626cb862 feat: 分店列表筛选name名称字段修改 GaoHao 2025-04-11 09:47:00 +0800
• bfca8f4013 Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store wwz 2025-04-11 09:37:31 +0800
• 682fe03165 feat: 更改跳转 wwz 2025-04-11 09:37:28 +0800
• 8290462eda Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store GaoHao 2025-04-10 18:27:26 +0800
• 6c72027a86 feat: 商品同步增加 GaoHao 2025-04-10 18:27:09 +0800
• 462f75ce3e Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz wwz 2025-04-10 17:51:47 +0800
• 6cb1968b80 feat: 进销存更改 wwz 2025-04-10 17:51:14 +0800
• c3c9437939 Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store GaoHao 2025-04-10 17:39:48 +0800
• 61bd37de32 feat: 供应商账单付款回显修改 GaoHao 2025-04-10 17:39:34 +0800
• 8126907093 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test YeMingfei666 2025-04-10 16:42:58 +0800
• 63aec07617 feat: 增加decimal数字计算库，修复出入库单位切换价格展示问题 YeMingfei666 2025-04-10 16:42:18 +0800
• 34ab5a9643 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store YeMingfei666 2025-04-10 16:02:25 +0800
• 8746ebd8c3 fix: 修复耗材添加关闭后部分数据未重置引起的再次添加提示报错问题 YeMingfei666 2025-04-10 16:01:32 +0800
• dbf8f8f05d feat: 供应商账单默认值显示处理 GaoHao 2025-04-10 14:42:18 +0800
• 2922de551a Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz wwz-master wwz 2025-04-10 14:29:22 +0800
• 5b30b23ad3 feat: 通知中心 wwz 2025-04-10 14:29:10 +0800
• dedaaac375 feat: 销售统计分类获取优化 GaoHao 2025-04-10 11:00:58 +0800
• eb6dffb3d2 feat:数据统计自定义增加默认时间 GaoHao 2025-04-10 10:38:39 +0800
• 7df5163ee0 Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store GaoHao 2025-04-10 09:16:12 +0800
• dce9fa7cdb feat: 筛选时间条件增加时分秒 GaoHao 2025-04-09 18:27:35 +0800
• 787f6606e4 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test YeMingfei666 2025-04-09 18:21:30 +0800
• 26b569a6a1 fix: 修复代客下单在已有历史订单且不在展示订单信息时，更多支付点击提示购物车为空问题 YeMingfei666 2025-04-09 18:21:03 +0800
• 49d43dc22c Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test YeMingfei666 2025-04-09 18:12:24 +0800
• 29ab771472 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test YeMingfei666 2025-04-09 18:12:13 +0800
• 9a7384937f fix: 优化修复代客下单先付模式下点击微信/支付宝按钮弹窗一次后再点击无效 YeMingfei666 2025-04-09 18:11:47 +0800
• d4c4989b26 feat: 筛选时间条件增加时分秒 GaoHao 2025-04-09 18:02:02 +0800
• d3e18f3a8c Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store GaoHao 2025-04-09 17:33:05 +0800
• f1e85eeb27 feat：分店筛选显示条件增加 GaoHao 2025-04-09 17:32:50 +0800
• fd3167d325 fix: 更新readme文档测试服务器相关文档 YeMingfei666 2025-04-09 17:17:21 +0800
• 5bd2172ba2 fix: 更新readme文档，删除不用的测试服务器，测试服务器改为本地linux服务器 YeMingfei666 2025-04-09 17:14:46 +0800
• 78806f627e Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test YeMingfei666 2025-04-09 17:08:32 +0800
• cb6fa28e2a fix: 修复临时菜添加成功未加入购物车 YeMingfei666 2025-04-09 17:08:05 +0800