Commit Graph

160 Commits

Author SHA1 Message Date
sxu d7e5ffa191 分页查询人员及生物识别特征 2025-02-28 18:02:32 +08:00
sxu 9b5715bd4e 系统区域权限树 2025-02-28 16:51:02 +08:00
sxu 23b671d75d util 2025-02-28 15:28:55 +08:00
sxu d9850db280 util 2025-02-28 14:28:01 +08:00
sxu 8e052e3cb0 配置文件 2025-02-26 15:38:02 +08:00
sxu 6984fbea54 配置文件 2025-02-26 13:45:51 +08:00
sxu 569837f536 配置文件 2025-02-26 13:14:06 +08:00
sxu 1d0bba6f73 配置文件 2025-02-26 13:08:51 +08:00
sxu c5b60c8953 配置文件 2025-02-26 13:00:07 +08:00
sxu 5ae89b8a2c 配置文件 2025-02-26 12:57:18 +08:00
tqzhang 7f44c326e9 驿站:维修服务 2025-02-26 10:27:46 +08:00
sxu 40210e8a1f 配置文件 2025-02-26 10:23:31 +08:00
sxu 43b93a8948 修改消息 2025-02-25 17:00:50 +08:00
sxu 6b6ae96610 最少充值金额不能少于1分 2025-02-25 16:35:23 +08:00
sxu bafd8a09b4 配置移到nacos里,参考0.244命名空间smart-canteen 2025-02-25 12:49:41 +08:00
sxu ddaf3fdb08 配置移到nacos里,参考0.244命名空间smart-canteen 2025-02-25 11:06:58 +08:00
sxu 66529793f6 优化补缺 2025-02-24 14:05:52 +08:00
sxu 2e17b013ac 244 oss地址 2025-02-24 11:32:58 +08:00
sxu 1911eaa0b5 Merge remote-tracking branch 'origin/master' 2025-02-24 11:18:31 +08:00
sxu accef4fe35 已配置到0.244的nacos里,请copy到本地nacos 2025-02-24 11:18:26 +08:00
gaowdong 67529394c8 Merge remote-tracking branch 'origin/master' 2025-02-24 11:01:32 +08:00
gaowdong 002d561364 预订单-提交 2025-02-24 11:01:25 +08:00
sxu d8ed15c45d add config to 244 2025-02-24 09:22:41 +08:00
sxu 8e03e2ac67 sync_pay_state 2025-02-21 18:01:14 +08:00
tqzhang 1d8ac90291 驿站:保洁服务 2025-02-21 16:52:30 +08:00
sxu a3cd3c7836 sync_pay_state 2025-02-21 16:43:34 +08:00
tqzhang 9a62d10b01 驿站:理疗预约支付、退款、洗衣服务、专家讲座等内容 2025-02-21 14:26:44 +08:00
liux 545ec852c3 新增收货地址、删除收货地址接口 2025-02-21 13:53:44 +08:00
gaowdong db6d4a5362 购物车修改 2025-02-21 10:40:52 +08:00
gaowdong 55c21ea4fc 购物车修改 2025-02-21 10:32:49 +08:00
gaowdong 628a4d0de3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/business/OrderPlaceBusiness.java
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/business/impl/OrderPlaceBusinessImpl.java
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/OrderInfoService.java
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/custom/OrderCustomAndroidBusiness.java
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mq/OrderMessageSend.java
2025-02-21 10:28:01 +08:00
gaowdong 97167a7bd9 购物车修改 2025-02-21 10:17:22 +08:00
sxu 287d5bf51c 同步支付状态 2025-02-21 10:05:16 +08:00
gaowdong 4a6b44d2cb Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Smart-Canteen 2025-02-21 09:36:29 +08:00
gaowdong 9871846e56 与订餐-退单 2025-02-20 17:13:18 +08:00
skjia 7fa5b3d685 jsk getReserveMealCanteenList 修正 2025-02-20 15:14:34 +08:00
sxu ac0a15597c 去掉多余属性 2025-02-20 14:17:17 +08:00
sxu 244755f7ce 配置文件 2025-02-20 13:10:58 +08:00
sxu b3acf5f7c0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap-smart_canteen_local.yml
2025-02-20 13:05:14 +08:00
sxu 4cdef0b751 配置文件 2025-02-20 13:04:36 +08:00
liux 7e8f5f94a5 Merge remote-tracking branch 'origin/master' 2025-02-20 13:02:39 +08:00
liux c842763898 问题修改 2025-02-20 13:02:10 +08:00
gaowdong 009ca9e264 与订餐 提交 2025-02-20 11:22:21 +08:00
sxu d7466b96a3 Merge branch 'master' into coupon 2025-02-20 09:39:04 +08:00
tqzhang 22af9f8815 驿站:保存头像 2025-02-20 09:31:39 +08:00
tqzhang 901bac13f1 驿站:工具分享、多文件整理命名等 2025-02-20 09:07:01 +08:00
sxu 87ecfc0a02 账户相关 2025-02-19 20:41:29 +08:00
sxu c1a51266a3 获取订单评价数量 2025-02-19 18:54:42 +08:00
sxu 8c29099148 获取订单评价数量 2025-02-19 18:39:36 +08:00
tqzhang 3d74f5a8b9 驿站:物业服务、洗衣服务 2025-02-18 15:26:53 +08:00