Commit Graph
1700 Commits
Author SHA1 Message Date
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
dzc 122160ba8d Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-07-06 18:00:15 +08:00
dzc bf93bb740d feat:我的食堂权限 2026-07-06 18:00:11 +08:00
zjf 91a2facb83 菜谱排餐 2026-07-03 10:19:57 +08:00
zjf 245efd3936 Merge remote-tracking branch 'origin/master' 2026-06-30 18:27:07 +08:00
zjf dca8a595e6 app平台广告 2026-06-30 18:26:46 +08:00
dzc 89845efe39 11 2026-06-30 17:52:57 +08:00
dzc ac4e081070 feat:页面bug修改 2026-06-26 13:58:09 +08:00
dzc 621a04b45b feat:适配老版本 2026-06-25 22:26:09 +08:00
dzc 2a7e1d6c98 11 2026-06-25 20:42:01 +08:00
dzc 83fc1beaf8 11 2026-06-25 20:31:32 +08:00
dzc 1244f3bfd2 feat:食堂预约统计bug 2026-06-25 19:43:17 +08:00
dzc a8b788c8e8 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-06-25 18:27:07 +08:00
dzc 5e17576074 feat:商城支付 2026-06-25 18:26:36 +08:00
zjf 2c5ef59859 修复微信扫码登录签发不一致 2026-06-24 21:14:01 +08:00
zjf 30bad82955 修复微信扫码登录签发不一致 2026-06-24 20:50:20 +08:00
zjf 7a386a4a43 Merge remote-tracking branch 'origin/master' 2026-06-24 09:31:00 +08:00
zjf bb219fb6dc 扫码确认不记失败次数 2026-06-24 09:30:41 +08:00
dzc 0f7c3c496b feat:商城支付、时间段选择 2026-06-23 19:07:28 +08:00
dzc d435283d06 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax 2026-06-22 18:31:05 +08:00