zianxin/biz-api-cloud-zax
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,719 Commits 1 Branch 0 Tags
f7ca3ef39699ad09f94610055a1b0c5fa6fd4e5b
Commit Graph
1719 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zjf f7ca3ef396 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
 2026-08-06 22:21:37 +08:00
zjf 0ef48ae331 库存，菜品详情， 2026-08-06 22:20:38 +08:00
dzc 5569212c95 feat:聚合支付 
feat:收银结算优化
 2026-08-06 20:55:55 +08:00
dzc ccc2b0e4da feat:套餐展示 2026-08-06 11:46:03 +08:00
dzc 112c8dde3c feat:聚合码支付 2026-08-06 09:51:33 +08:00
dzc d19cb1137e Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-08-04 17:11:25 +08:00
dzc 3197fa73d5 feat:多餐段订餐模式 
feat:骨架屏
 2026-08-04 17:11:20 +08:00
zjf f12fe00e0c Merge remote-tracking branch 'origin/master' 2026-08-04 16:40:17 +08:00
zjf bb88b7c549 菜谱列表支持套餐 2026-08-04 16:40:02 +08:00
dzc 6b1b4a03c4 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-08-04 10:26:59 +08:00
dzc 03f3c8cb07 feat:预约菜谱类型 2026-08-04 10:26:55 +08:00
zjf 7234134a65 Merge remote-tracking branch 'origin/master' 2026-08-03 15:59:25 +08:00
zjf 543fe454d7 增加解析参数 2026-08-03 15:59:10 +08:00
zjf 839bfb4585 增加解析参数 2026-08-03 15:58:54 +08:00
dzc e4575a0c1a 111 2026-07-31 20:55:13 +08:00
dzc 7d1e9a01f8 feat:apk自动更新 2026-07-30 17:06:48 +08:00
dzc 06330260e5 feat:设备日志模块 2026-07-30 13:15:45 +08:00
dzc 41fa28775b feat:预计使用时间 2026-07-29 15:01:16 +08:00
dzc d96206828e fix:食堂菜品预约修改统计 2026-07-29 10:06:10 +08:00
dzc dfac86d46d 11 2026-07-29 00:12:35 +08:00
dzc e6591378ca 11 2026-07-29 00:02:52 +08:00
dzc 88f163a541 fix:导入学生部门id 2026-07-28 22:51:06 +08:00
dzc 21e5739e94 feat:充值 2026-07-28 19:28:23 +08:00
dzc 8eb744bf41 feat:添加了excel的dict注解 
feat:优化了学生导入
 2026-07-28 11:53:32 +08:00
dzc bfd1659bdb feat:机器核销 2026-07-27 20:34:40 +08:00
dzc 89384d07f4 feat:学生导入 2026-07-27 10:56:18 +08:00
dzc d62c702c8e eat:查询菜单页面主屏+副屏 2026-07-24 17:30:55 +08:00
dzc cce873b1c6 feat:订餐人灵活控制 2026-07-22 19:15:54 +08:00
dzc e2d28b5d53 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-07-22 18:56:09 +08:00
dzc 98bbc12de6 feat:代订餐下单 2026-07-22 18:56:05 +08:00
zjf 09ce812c2a Merge remote-tracking branch 'origin/master' 2026-07-22 15:07:26 +08:00
zjf 52e2996a33 在线点餐套餐 2026-07-22 15:06:57 +08:00
dzc 61bb43e5c5 feat:加入预约时间模式 2026-07-22 13:42:25 +08:00
dzc 6b2a95cc65 feat:周期餐段 2026-07-21 21:04:18 +08:00
dzc be37903a1a feat:监护人维护人脸流程 2026-07-21 14:26:04 +08:00
dzc 0149da2823 feat:关系图谱优化 2026-07-20 17:51:01 +08:00
dzc 2cf4ef4d10 feat:商户配置-代订餐用户关系 2026-07-20 16:50:10 +08:00
dzc 49b92630d6 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 
# Conflicts:
#	pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
 2026-07-20 15:51:19 +08:00
dzc c2ab16c1fc feat:后台用户关系绑定 2026-07-20 15:48:59 +08:00
zjf 4916e0a036 Merge remote-tracking branch 'origin/master' 2026-07-17 17:30:19 +08:00
zjf 41eb7952b0 菜谱排餐 2026-07-17 17:29:36 +08:00
dzc abb9e124f6 fix:还有个bug，商城的logo和轮播图，移动端你是不是调用了一个接口？我logo和轮播不一样，但是，展示的，都是ilogo的图片 2026-07-17 17:06:11 +08:00
dzc 1f23dd15c4 feat:预定统计 2026-07-17 16:56:22 +08:00
dzc d43fe27242 111 2026-07-14 10:02:31 +08:00
dzc b3845e6d34 111 2026-07-13 19:52:56 +08:00
dzc bce1885ccf 11 2026-07-07 20:01:55 +08:00
dzc df41665efc 11 2026-07-07 18:44:25 +08:00
dzc ac2c42dbc8 feat:极光推送改为线上模式 2026-07-07 18:10:28 +08:00
dzc ba0c6f08bd feat:定餐下单，后台增加一个控制，比如控制单次只能一餐，或者可以多选这样的开关 2026-07-07 17:47:39 +08:00
dzc df1eeef0d0 feat:极光推送 2026-07-07 17:05:50 +08:00