czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
288 Commits 14 Branches 0 Tags 5 MiB
Commit Graph

288 Commits

Author SHA1 Message Date
GYJ 9590359f13 Merge remote-tracking branch 'origin/dev' into dev 2024-07-11 16:59:15 +08:00
wangw ed2440d2d5 商品 规格 编辑 2024-07-11 16:58:10 +08:00
韩鹏辉 2ed9bb48ec 修改耗材信息校验 2024-07-11 15:43:13 +08:00
SongZhang 134cb90a02 Merge remote-tracking branch 'origin/master' 2024-07-11 13:51:30 +08:00
SongZhang bebe538e79 库存预警数值不展示修复 2024-07-11 13:51:20 +08:00
SongZhang 98e49a8e30 Merge remote-tracking branch 'origin/dev' 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java
 2024-07-11 13:37:04 +08:00
韩鹏辉 11b3af6104 添加发送短信,设置操作密码 2024-07-11 13:34:28 +08:00
韩鹏辉 21fb470052 添加发送短信 2024-07-11 11:35:35 +08:00
韩鹏辉 6a8ea3416f Merge remote-tracking branch 'origin/dev' 2024-07-10 18:16:17 +08:00
wangw da97da3d7d 会员列表 2024-07-10 18:07:18 +08:00
GYJ 35312b6137 Merge branch 'refs/heads/dev' 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java
 2024-07-10 17:46:14 +08:00
wangw 713350ac3a 会员标识 2024-07-10 17:42:59 +08:00
韩鹏辉 7214d9d4fc 添加前端传递数据校验 2024-07-10 17:40:52 +08:00
韩鹏辉 90501ccfb1 添加前端传递数据校验 2024-07-10 17:40:22 +08:00
韩鹏辉 17cfaa2a61 Merge remote-tracking branch 'origin/dev' into dev 2024-07-10 17:26:06 +08:00
韩鹏辉 570f5611df 修改耗材商品批量添加 2024-07-10 17:25:50 +08:00
wangw ad628b3d72 sku 逻辑删除 2024-07-10 17:11:02 +08:00
韩鹏辉 c49765c353 修改耗材商品批量添加 2024-07-10 16:18:34 +08:00
GYJ 8ad0274048 Merge branch 'refs/heads/gyj' into dev 2024-07-10 15:20:11 +08:00
GYJ 9f2f9bf59a 充值查询增加 scanMemberAwardIn 系统奖励 2024-07-10 15:19:52 +08:00
wangw 981671d583 歌曲页面 增加 歌手页地址 2024-07-10 14:09:26 +08:00
wangw d528c4c10d 歌曲页面 增加 歌手页地址 2024-07-10 14:00:12 +08:00
GYJ 2efdb7d780 Merge branch 'refs/heads/gyj' into dev 2024-07-10 13:41:34 +08:00
GYJ df6a41430e 修改查询会员充值bug 2024-07-10 13:37:39 +08:00
韩鹏辉 f23fa44c57 修改耗材商品批量添加 2024-07-10 11:08:10 +08:00
GYJ b3194b83dc 修复查询会员充值金额bug 2024-07-10 10:12:21 +08:00
GYJ 27c8cb1959 Merge branch 'refs/heads/dev' 2024-07-10 09:27:25 +08:00
GYJ d5a5332e78 Merge branch 'refs/heads/dev' 2024-07-10 09:08:43 +08:00
wangw 01d7327be6 Merge branch 'gyj' into dev 2024-07-09 16:13:12 +08:00
GYJ a09a46e0ea 查询导出充值记录 2024-07-09 16:04:25 +08:00
韩鹏辉 a5cea4293f 添加订单台桌字段 2024-07-09 16:02:38 +08:00
SongZhang 370fe409f6 Merge remote-tracking branch 'origin/dev' 2024-07-09 15:55:30 +08:00
wangw 5c960ec661 歌手页 2024-07-09 15:29:31 +08:00
wangw abc13bcf69 歌曲订单管理 2024-07-09 15:17:30 +08:00
SongZhang f55f38a8fe Merge remote-tracking branch 'origin/dev' 2024-07-09 11:48:46 +08:00
韩鹏辉 8ad974bfa4 修改批量出入库 2024-07-09 11:10:09 +08:00
韩鹏辉 c06c4cb867 修改批量出入库 2024-07-09 10:57:10 +08:00
SongZhang c86e28a363 Merge remote-tracking branch 'origin/zs' 2024-07-09 10:54:12 +08:00
韩鹏辉 497d0a7b12 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
 2024-07-09 10:51:55 +08:00
韩鹏辉 90bfde259c 修改批量出入库 2024-07-09 10:50:30 +08:00
GYJ 507b4d4d9e 处理没有订单是台桌信息为空 2024-07-09 10:38:05 +08:00
SongZhang faadcea62b 修复会员查询余额不准确问题 2024-07-09 10:36:23 +08:00
GYJ de049b5791 增加排序 2024-07-09 09:29:02 +08:00
GYJ 52ebdfa90b 查询所有桌台信息 2024-07-08 18:24:24 +08:00
韩鹏辉 8245ae9b8c 修改批量出入库 2024-07-08 18:19:22 +08:00
韩鹏辉 275803feba 修改批量出入库 2024-07-08 18:13:38 +08:00
韩鹏辉 82005ce2d4 修改批量出入库 2024-07-08 18:09:20 +08:00
wangw 3cdb4edea3 歌曲管理 2024-07-08 17:43:39 +08:00
韩鹏辉 fadfe98303 修改批量出入库 2024-07-08 16:47:13 +08:00
韩鹏辉 0d2888b2d3 Merge remote-tracking branch 'origin/dev' into dev 2024-07-08 16:41:29 +08:00