 zjf
|
3ff79fbfae
|
Merge remote-tracking branch 'origin/master'
|
2026-08-26 15:12:29 +08:00 |
|
|
zjf
|
417c9d5754
|
修复解密问题
|
2026-08-26 15:12:17 +08:00 |
|
 dzc
|
14c2acb6c2
|
feat:支付宝分账
|
2026-08-26 13:10:07 +08:00 |
|
|
dzc
|
388ef914fc
|
11
|
2026-08-25 13:07:03 +08:00 |
|
|
dzc
|
890b927354
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
|
2026-08-25 12:49:40 +08:00 |
|
|
dzc
|
af9fece0c0
|
feat:hard、wallet表格添加人员、人员身份字段和搜索
fix:优化hard模块统计导出
|
2026-08-25 12:49:36 +08:00 |
|
|
zjf
|
575a8cebe5
|
敏实导入优化
|
2026-08-25 12:09:29 +08:00 |
|
|
zjf
|
82e3fc02db
|
Merge remote-tracking branch 'origin/master'
|
2026-08-25 12:03:39 +08:00 |
|
|
zjf
|
27c7ceb3c4
|
敏实导入优化
|
2026-08-25 12:03:19 +08:00 |
|
|
dzc
|
9d2a0ee1ab
|
feat:钱包的流水增加"备注字段"
fix:合并设备管理的统计模块
|
2026-08-25 11:11:01 +08:00 |
|
|
dzc
|
d1cd86dfa4
|
feat：重构"食堂菜品购买统计"+"食堂菜品部门统计"菜单统计预约核销订单+线下购买订单
feat：增加机器的每日菜谱库存扣款
feat：增加订单"退回到核销前"按钮
|
2026-08-24 18:39:59 +08:00 |
|
|
dzc
|
8d31f20cec
|
feat:优化一下用户查询
|
2026-08-24 10:29:04 +08:00 |
|
|
dzc
|
dbf48af330
|
11
|
2026-08-23 20:40:22 +08:00 |
|
|
dzc
|
cf35795f3d
|
11
|
2026-08-23 19:12:15 +08:00 |
|
|
dzc
|
d18167e084
|
feat:订单列表增加预约时间
feat:优化食堂菜品预约统计导出
feat:增加订单识别证据图片功能
|
2026-08-23 18:49:40 +08:00 |
|
|
dzc
|
78ce41a4de
|
feat:人员菜品预约统计增加人员和身份查询
|
2026-08-23 15:59:24 +08:00 |
|
|
dzc
|
5b4a505780
|
feat:导出excel优化
|
2026-08-23 15:16:37 +08:00 |
|
|
dzc
|
e5b25d0647
|
feat:导出excel优化
|
2026-08-23 14:39:31 +08:00 |
|
|
dzc
|
f917e231af
|
feat:钱包配置json解析
|
2026-08-23 13:30:28 +08:00 |
|
|
dzc
|
15743935ef
|
feat:学号快速查询
fix:商品统计排除退款、退款中
fix:售后列表增加退款类型
|
2026-08-23 13:18:19 +08:00 |
|
|
dzc
|
324708ffdb
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
|
2026-08-23 11:00:07 +08:00 |
|
|
dzc
|
e4d8b4f354
|
feat:商品预约导出
feat:个人菜谱预约统计
feat:预定扣库存
feat:过期订单自动退款
|
2026-08-23 11:00:02 +08:00 |
|
|
dzc
|
e1cf5d5b90
|
feat:商品预约导出
feat:个人菜谱预约统计
feat:预定扣库存
feat:过期订单自动退款
|
2026-08-23 10:59:54 +08:00 |
|
|
zjf
|
aca18e8a6b
|
敏实报表
|
2026-08-22 23:19:41 +08:00 |
|
|
zjf
|
cb4aaef486
|
暂停注册
|
2026-08-21 14:41:53 +08:00 |
|
|
zjf
|
45467484fb
|
Merge remote-tracking branch 'origin/master'
|
2026-08-20 17:32:32 +08:00 |
|
|
zjf
|
42dbce5e8f
|
敏实报表
|
2026-08-20 17:32:18 +08:00 |
|
|
dzc
|
a859b0ab19
|
11
|
2026-08-18 20:19:46 +08:00 |
|
|
dzc
|
c6a6251c42
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
|
2026-08-18 20:15:11 +08:00 |
|
|
dzc
|
5910c5ab7c
|
feat：增加人员预约统计和导出
|
2026-08-18 20:15:07 +08:00 |
|
|
zjf
|
96f495d555
|
Merge remote-tracking branch 'origin/master'
|
2026-08-18 18:13:32 +08:00 |
|
|
zjf
|
94f39deb2c
|
敏实报表
|
2026-08-18 18:13:07 +08:00 |
|
|
dzc
|
cb5fdc54d8
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
|
2026-08-18 16:36:37 +08:00 |
|
|
dzc
|
ddd65f14ee
|
feat:新增用户，用户可以选择监护人
|
2026-08-18 16:36:33 +08:00 |
|
|
zjf
|
db277500de
|
Merge remote-tracking branch 'origin/master'
|
2026-08-18 09:22:01 +08:00 |
|
|
zjf
|
0c97c9820b
|
菜品导入不覆盖选项
|
2026-08-18 09:21:46 +08:00 |
|
|
dzc
|
02a25a2a57
|
11
|
2026-08-17 20:02:10 +08:00 |
|
|
dzc
|
3dfac779ce
|
111
|
2026-08-17 19:35:14 +08:00 |
|
|
dzc
|
d2ae6c6ff6
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
|
2026-08-17 18:42:13 +08:00 |
|
|
dzc
|
f7aab36210
|
feat:删除绑定关系
feat:修改绑定关系权限问题
feat:学生导入饭卡
feat:学生充值导入
feat:学生用户类型增加监护人手机号
|
2026-08-17 18:42:09 +08:00 |
|
|
zjf
|
f3f5f5a1ce
|
Merge remote-tracking branch 'origin/master'
|
2026-08-17 17:45:47 +08:00 |
|
|
zjf
|
7275ac96e6
|
用户管理筛选条件是否上传人脸
|
2026-08-17 17:45:38 +08:00 |
|
|
dzc
|
195756e80a
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
|
2026-08-17 14:31:56 +08:00 |
|
|
dzc
|
53a6593400
|
feat:增加人员导出进度条
feat:增加人员导出的时候导出人员身份
feat:增加后台api和机器人脸同步通过mqtt实现增量变化
feat:导入饭卡卡号没有绑定卡号自动绑定卡号
|
2026-08-17 14:31:52 +08:00 |
|
|
zjf
|
72f8012c11
|
Merge remote-tracking branch 'origin/master'
|
2026-08-17 13:49:14 +08:00 |
|
|
zjf
|
d7142f13d5
|
食堂报表，用户管理姓名支持数字
|
2026-08-17 13:48:56 +08:00 |
|
|
dzc
|
fcfe33355b
|
feat：bug修改
|
2026-08-14 21:37:48 +08:00 |
|
|
dzc
|
6d019b10a0
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax
|
2026-08-14 19:49:09 +08:00 |
|
|
dzc
|
f7ff135416
|
feat:钱包操作、被监护人操作消费消息提醒、增加消息模块
|
2026-08-14 19:49:06 +08:00 |
|
|
zjf
|
40c5b409fd
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml
|
2026-08-14 16:40:38 +08:00 |
|