gaowdong
|
c8b12d2a17
|
Merge remote-tracking branch 'origin/master'
|
2025-03-19 11:15:18 +08:00 |
|
gaowdong
|
d6328902c9
|
双屏机-设备接口-设备时间下发
|
2025-03-19 11:15:03 +08:00 |
 jjLv
|
173b5cace9
|
Merge remote-tracking branch 'origin/master'
|
2025-03-19 10:34:16 +08:00 |
|
jjLv
|
b49f1cc844
|
删除获取指定角色用户列表
|
2025-03-19 10:24:54 +08:00 |
|
gaowdong
|
8e106fd5ca
|
Merge remote-tracking branch 'origin/master'
|
2025-03-18 16:22:48 +08:00 |
|
gaowdong
|
fe79f504d3
|
双屏机-设备接口-交换密钥
|
2025-03-18 16:22:40 +08:00 |
|
gaowdong
|
a2d8722a6d
|
双屏机-设备接口
|
2025-03-18 14:33:00 +08:00 |
 sxu
|
a9027f2973
|
SUPER_ADMIN_ROLE_KEY
|
2025-03-18 11:34:00 +08:00 |
|
jjLv
|
181fba02a9
|
write/off
|
2025-03-13 15:09:24 +08:00 |
|
jjLv
|
7313121b92
|
获取指定角色用户列表--list/by/role
|
2025-03-13 09:55:14 +08:00 |
|
jjLv
|
340329874d
|
Merge remote-tracking branch 'origin/master'
|
2025-03-13 09:29:58 +08:00 |
|
sxu
|
91880d8096
|
ROLE_ADMIN
|
2025-03-18 09:28:04 +08:00 |
|
sxu
|
ed756d6399
|
SecureManager delete
|
2025-03-17 19:25:44 +08:00 |
|
gaowdong
|
c6696e6aed
|
双屏机-设备接口
|
2025-03-17 18:14:38 +08:00 |
|
gaowdong
|
17c1529d86
|
h5-订单-待支付列表
|
2025-03-17 09:48:14 +08:00 |
|
sxu
|
fe51edfd94
|
Merge branch 'ah-sbd-h5'
|
2025-03-15 18:15:04 +08:00 |
|
sxu
|
d099199a8e
|
get token
|
2025-03-15 16:53:35 +08:00 |
|
sxu
|
501759fa68
|
get token
|
2025-03-15 16:28:14 +08:00 |
|
sxu
|
17c4508aad
|
get token
|
2025-03-14 17:45:25 +08:00 |
|
sxu
|
852705bff1
|
get token
|
2025-03-14 17:13:50 +08:00 |
|
sxu
|
517b804dbd
|
get token
|
2025-03-14 17:09:40 +08:00 |
|
gaowdong
|
f3d4bdb3a8
|
Merge remote-tracking branch 'origin/master'
|
2025-03-14 16:46:56 +08:00 |
|
gaowdong
|
85e3ce7fc0
|
修改注释
|
2025-03-14 16:46:49 +08:00 |
|
sxu
|
8332089a7a
|
删除 MgrUser 相关
|
2025-03-14 16:04:42 +08:00 |
|
gaowdong
|
4e280b7b6d
|
替换 mgr_role_canteen 表为 sys_role_canteen
替换 mgr_role_warehouse 表为 sys_role_warehouse
|
2025-03-14 14:14:14 +08:00 |
|
gaowdong
|
41fb46a8ca
|
Merge remote-tracking branch 'origin/master' into replace_table
|
2025-03-14 13:40:03 +08:00 |
|
gaowdong
|
0a14a5e77a
|
替换 mgr_role_canteen 表为 sys_role_canteen
替换 mgr_role_warehouse 表为 sys_role_warehouse
|
2025-03-14 13:39:37 +08:00 |
|
gaowdong
|
c040602a3c
|
替换 mgr_role_canteen 表为 sys_role_canteen
替换 mgr_role_warehouse 表为 sys_role_warehouse
|
2025-03-14 13:08:35 +08:00 |
|
gaowdong
|
31b5076320
|
替换 mgr_role_area 表为 sys_role_area
|
2025-03-14 11:17:41 +08:00 |
|
gaowdong
|
9c6ca487f0
|
替换 mgr_role_org 表为 sys_role_dept
|
2025-03-14 10:51:12 +08:00 |
|
gaowdong
|
ba0a45ed8f
|
替换 mgr_user_role 表为 sys_user_role
|
2025-03-14 10:35:49 +08:00 |
|
gaowdong
|
7c7217eb30
|
替换 mgr_role 表为 sys_role
|
2025-03-14 10:22:40 +08:00 |
|
gaowdong
|
69e6660e81
|
替换 cust_info 表为 sys_user
|
2025-03-13 18:16:12 +08:00 |
|
sxu
|
53b52e7ba2
|
healthbody
|
2025-03-13 17:07:43 +08:00 |
|
sxu
|
a1b1a18d4d
|
healthbody
|
2025-03-13 17:01:04 +08:00 |
|
sxu
|
c4c677a08f
|
fix conflict
|
2025-03-13 11:19:02 +08:00 |
|
sxu
|
10d4b6b56c
|
healthbody
|
2025-03-13 11:04:47 +08:00 |
|
sxu
|
5d343bb555
|
healthbody
|
2025-03-13 10:47:45 +08:00 |
|
sxu
|
dd28640b3b
|
healthbody
|
2025-03-13 09:45:56 +08:00 |
|
sxu
|
9d0284a032
|
healthbody
|
2025-03-13 09:37:39 +08:00 |
|
jjLv
|
16c6801456
|
MAPPER位置更改
|
2025-03-13 09:29:44 +08:00 |
|
jjLv
|
ae3fcf6b50
|
Merge remote-tracking branch 'origin/master'
|
2025-03-13 15:10:25 +08:00 |
|
jjLv
|
89d5369c4f
|
食堂：消费机菜单
|
2025-03-14 11:13:18 +08:00 |
|
sxu
|
3a2a90fe24
|
healthbody
|
2025-03-13 09:22:42 +08:00 |
|
sxu
|
c58ecd61b8
|
healthbody
|
2025-03-12 22:02:40 +08:00 |
|
sxu
|
f00653630b
|
healthbody
|
2025-03-12 21:52:11 +08:00 |
|
sxu
|
3a8c9344c7
|
healthbody
|
2025-03-12 20:26:59 +08:00 |
|
gaowdong
|
e01f117a07
|
Merge remote-tracking branch 'origin/master' into replace_table
|
2025-03-12 16:24:33 +08:00 |
|
gaowdong
|
2e272af445
|
替换 cust_org 表为 sys_dept
|
2025-03-12 16:22:41 +08:00 |
|
sxu
|
d0d82b173b
|
Merge branch 'ah-sbd-h5'
|
2025-03-12 10:17:54 +08:00 |
|
gaowdong
|
29676f8ef6
|
订单log
|
2025-03-12 10:15:09 +08:00 |
|
sxu
|
907e9908a6
|
data permission
|
2025-03-11 17:09:45 +08:00 |
|
sxu
|
bb5f185cd7
|
Revert "移除 PERMISSION_STALL， 用PERMISSION_CANTEEN替代"
This reverts commit 324f56d922.
|
2025-03-11 16:55:47 +08:00 |
|
gaowdong
|
a14351ff63
|
设备端-支付/订单/菜谱
|
2025-03-11 15:20:47 +08:00 |
|
sxu
|
6043868db8
|
错误的角色类型
|
2025-03-11 14:47:03 +08:00 |
|
sxu
|
ff658d7571
|
Revert "data permission"
This reverts commit 7c20eb9b1d.
|
2025-03-11 14:25:53 +08:00 |
|
sxu
|
7c20eb9b1d
|
data permission
|
2025-03-11 14:22:46 +08:00 |
|
sxu
|
3bab462b7c
|
集团版--权限区域食堂档口树
|
2025-03-11 13:38:24 +08:00 |
|
sxu
|
324f56d922
|
移除 PERMISSION_STALL， 用PERMISSION_CANTEEN替代
|
2025-03-11 13:10:26 +08:00 |
|
sxu
|
3941dce9ee
|
data permission
|
2025-03-11 12:53:57 +08:00 |
|
sxu
|
e4b64130c8
|
getOrgIdListByUserEffId
|
2025-03-11 11:24:09 +08:00 |
|
sxu
|
6f7ee75ae7
|
apply datapermission
|
2025-03-10 19:08:37 +08:00 |
|
sxu
|
410193c53c
|
apply datapermission
|
2025-03-10 19:06:57 +08:00 |
|
sxu
|
f7f49960a1
|
Merge remote-tracking branch 'origin/master'
|
2025-03-10 19:02:42 +08:00 |
|
sxu
|
db6d6cc005
|
apply datapermission
|
2025-03-10 19:02:39 +08:00 |
|
jjLv
|
0fd82446b7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/dto/SupermarketInfoPageDTO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketConfigMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketInfoMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/model/SupermarketConfig.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/SupermarketInfoService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/vo/SupermarketInfoPageVO.java
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketConfigMapper.xml
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketInfoMapper.xml
|
2025-03-10 18:50:23 +08:00 |
|
jjLv
|
a046fc71b5
|
食堂：商品管理
|
2025-03-10 17:53:40 +08:00 |
|
sxu
|
c94153d979
|
LeNiuDataPermission fix
|
2025-03-10 17:29:53 +08:00 |
|
gaowdong
|
661f58b325
|
超市订单
|
2025-03-10 15:01:18 +08:00 |
|
gaowdong
|
a4ed486695
|
超市订单
|
2025-03-10 13:04:12 +08:00 |
|
sxu
|
77ce8969c9
|
Merge remote-tracking branch 'origin/master'
|
2025-03-10 11:10:44 +08:00 |
|
gaowdong
|
db302ee97b
|
超市订单
|
2025-03-10 10:33:45 +08:00 |
|
sxu
|
88e7a300cf
|
Revert "LeNiuDataPermission fix"
This reverts commit 8f3ae8526f.
|
2025-03-08 21:38:20 +08:00 |
|
sxu
|
b9875e3b21
|
Merge remote-tracking branch 'origin/master'
|
2025-03-07 19:48:30 +08:00 |
|
sxu
|
8f3ae8526f
|
LeNiuDataPermission fix
|
2025-03-07 19:48:23 +08:00 |
|
gaowdong
|
c55120e91c
|
Merge remote-tracking branch 'origin/master'
|
2025-03-07 18:33:21 +08:00 |
|
gaowdong
|
092bd3dddb
|
增加LeNiuDataPermission逻辑
|
2025-03-07 18:33:14 +08:00 |
|
sxu
|
cf2daeb670
|
添加uptime
|
2025-03-07 18:25:10 +08:00 |
|
sxu
|
17ac900ddd
|
Merge branch 'ah-sbd-h5'
|
2025-03-07 18:23:42 +08:00 |
|
sxu
|
175f339a53
|
添加uptime
|
2025-03-07 18:21:27 +08:00 |
|
gaowdong
|
d936979dc4
|
增加LeNiuDataPermission逻辑
|
2025-03-07 17:39:32 +08:00 |
|
gaowdong
|
db1e876bc6
|
删除@RequiresAuthentication
|
2025-03-07 14:12:16 +08:00 |
|
jjLv
|
2b01a92d34
|
食堂：pfy_菜品灶类信息管理、gyp_菜品功效控制器、pfy_菜品导入失败记录、pfy_菜品标签基础信息管理、gyp_菜系控制器、gyp_适宜人群控制器、pfy_菜品口味信息管理
|
2025-03-07 13:59:18 +08:00 |
|
gaowdong
|
356f3bd096
|
线上线下消费
|
2025-03-07 13:47:07 +08:00 |
|
sxu
|
2794953094
|
Merge branch 'ah-sbd-h5'
|
2025-03-07 12:17:32 +08:00 |
|
sxu
|
76e8caf1ef
|
添加uptime
|
2025-03-07 12:16:46 +08:00 |
|
sxu
|
d71c8b3b2d
|
改为sys_role and sys_user_role
|
2025-03-06 19:16:17 +08:00 |
|
sxu
|
84936608f7
|
改为sys_role and sys_user_role
|
2025-03-06 18:00:58 +08:00 |
|
jjLv
|
739fb39367
|
食堂：接口迁移
|
2025-03-06 17:46:50 +08:00 |
|
gaowdong
|
f772514283
|
线上线下消费
|
2025-03-06 17:12:12 +08:00 |
|
sxu
|
8206e7c962
|
Merge remote-tracking branch 'origin/master'
|
2025-03-05 15:54:11 +08:00 |
|
sxu
|
b62326f45c
|
获取角色
|
2025-03-05 15:54:07 +08:00 |
|
gaowdong
|
4ac8211277
|
获取指定日期菜谱计划菜品详情
|
2025-03-05 14:43:26 +08:00 |
|
sxu
|
26e913bcc6
|
获取所有类别的树形结构
|
2025-03-05 14:35:09 +08:00 |
|
sxu
|
f2f46b195a
|
Merge remote-tracking branch 'origin/master'
|
2025-03-05 14:33:25 +08:00 |
|
sxu
|
5eea4dbb4f
|
路径错误
|
2025-03-05 14:33:19 +08:00 |
 tqzhang
|
7f6b8e3255
|
Merge remote-tracking branch 'origin/master'
|
2025-03-05 14:30:39 +08:00 |
|
tqzhang
|
7683cd39c7
|
后台-菜谱计划发布v2
|
2025-03-05 14:30:12 +08:00 |
|
sxu
|
e2795eb385
|
获取角色
|
2025-03-05 14:29:09 +08:00 |
|
gaowdong
|
9eb79aeddf
|
合并代码
|
2025-03-05 14:10:09 +08:00 |
|
gaowdong
|
163d36c965
|
Merge remote-tracking branch 'origin/master' into dgw
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/alloc/model/AllocMetadata.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/AllocCanteenApi.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/AllocMealtimeApi.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/GlobalMetadataApi.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/controller/AllocCanteenController.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/controller/AllocMealtimeController.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/param/AllocCanteenStallPageParam.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/param/AllocCanteenStallParam.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocMealLineServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/util/MetadataUtil.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/mapper/CustInfoMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/CustInfoServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/api/DeviceV2Api.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/manage/dto/DeviceTypeDto.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/manage/mapper/DeviceInfoMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/manage/service/DeviceInfoService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/constant/MenuBindTypeEnum.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/constant/MenuRecipeSortEnum.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuAppRecipeMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/MenuRecipeBindSortService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeBindSortServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/merchant/api/MercMerchantApi.java
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/manage/DeviceInfoMapper.xml
|
2025-03-05 13:52:28 +08:00 |
|
gaowdong
|
5d01aac67c
|
双屏消费机
|
2025-03-05 13:06:43 +08:00 |
|
sxu
|
b594133df9
|
Merge branch 'ah-sbd-h5'
|
2025-03-05 12:49:51 +08:00 |
|
sxu
|
effd4fc22a
|
分页查询组织架构
|
2025-03-05 12:49:23 +08:00 |
|
sxu
|
19cf944022
|
Merge branch 'ah-sbd-h5'
|
2025-03-05 10:30:49 +08:00 |
|
sxu
|
c3974f79b0
|
分页查询组织架构
|
2025-03-05 10:23:25 +08:00 |
|
sxu
|
ade57fd7eb
|
Revert "分页查询组织架构"
This reverts commit 675c91c4aa.
|
2025-03-05 10:18:39 +08:00 |
|
sxu
|
b6ebd03144
|
Merge remote-tracking branch 'origin/master'
|
2025-03-05 10:13:54 +08:00 |
|
sxu
|
675c91c4aa
|
分页查询组织架构
|
2025-03-05 10:13:43 +08:00 |
|
tqzhang
|
524bc76019
|
后台-lsh_餐次时段控制器
|
2025-03-05 09:58:39 +08:00 |
|
tqzhang
|
46af1f9e09
|
后台-分页查询餐线列表
|
2025-03-05 09:42:40 +08:00 |
|
tqzhang
|
e3cbbe4a16
|
后台-类型排序
|
2025-03-05 09:34:31 +08:00 |
|
sxu
|
1c1c4b9b59
|
修复typeHandler错误
|
2025-03-04 18:28:52 +08:00 |
|
sxu
|
6b74547f81
|
Merge remote-tracking branch 'origin/master'
|
2025-03-04 18:15:47 +08:00 |
|
tqzhang
|
fb9c43b3f3
|
后台-pfy_新增菜品信息v2等
|
2025-03-04 18:15:08 +08:00 |
|
sxu
|
558b5534bc
|
查询人员列表添加条件
|
2025-03-04 18:12:39 +08:00 |
|
gaowdong
|
47f40c566c
|
区域/档口管理
|
2025-03-04 17:35:45 +08:00 |
|
gaowdong
|
cd763b4567
|
区域/档口管理
|
2025-03-04 17:26:02 +08:00 |
|
gaowdong
|
c919fdd4f7
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Houqin into dgw
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocAreaMapper.java
|
2025-03-04 17:24:12 +08:00 |
|
gaowdong
|
e70bd4511d
|
区域/档口管理
|
2025-03-04 17:22:57 +08:00 |
|
tqzhang
|
f9a1385933
|
后台-pfy_菜品类型信息管理
|
2025-03-04 14:46:29 +08:00 |
|
tqzhang
|
5339d3da57
|
后台-pfy_菜品类型信息管理
|
2025-03-04 14:46:00 +08:00 |
|
tqzhang
|
a34a540dad
|
后台-证书库查询
|
2025-03-04 14:13:10 +08:00 |
|
tqzhang
|
d70a9ba22c
|
后台-pfy_库存原料类别
|
2025-03-04 13:44:37 +08:00 |
|
tqzhang
|
b9cf66a178
|
后台-gyp_计量单位管理
|
2025-03-04 11:19:47 +08:00 |
|
tqzhang
|
c6cf0580f7
|
后台-gyp_商家食材原料信息管理
|
2025-03-04 11:05:09 +08:00 |
|
gaowdong
|
eac739145d
|
Merge remote-tracking branch 'origin/master' into dgw
|
2025-03-04 09:21:30 +08:00 |
|
gaowdong
|
d99b6f5735
|
档口管理
|
2025-03-04 09:21:12 +08:00 |
|
sxu
|
5c261cecf9
|
CipherQueryLikeHandler
|
2025-03-03 18:48:51 +08:00 |
|
sxu
|
9859691596
|
SM4EncDecHandler
|
2025-03-03 18:47:32 +08:00 |
|
sxu
|
c85d67f632
|
人员类别控制层
|
2025-03-03 18:28:46 +08:00 |
|
sxu
|
58c6720f60
|
人员类别控制层
|
2025-03-03 18:02:28 +08:00 |
|
gaowdong
|
01cca8b068
|
食堂管理 （增删改查）
|
2025-03-03 16:17:25 +08:00 |
|
tqzhang
|
ba50643942
|
后台-营养信息模块
|
2025-03-03 15:51:16 +08:00 |
|
sxu
|
914500550d
|
人员类别控制层
|
2025-03-03 15:02:32 +08:00 |
|
gaowdong
|
519b64ff18
|
区域管理 （增删改查）
|
2025-03-03 11:00:41 +08:00 |
|
sxu
|
d61fac9987
|
Merge branch 'ah-sbd-h5'
|
2025-03-03 10:52:14 +08:00 |
|
sxu
|
d7fa8764e7
|
分页查询人员及生物识别特征
|
2025-03-03 10:51:36 +08:00 |
|
tqzhang
|
f7d21bb0ea
|
驿站：绿植服务内容
|
2025-03-03 09:28:57 +08:00 |
|
sxu
|
10ec8d54f7
|
配置文件
|
2025-03-01 10:50:23 +08:00 |
|
sxu
|
3d87769781
|
分页查询人员及生物识别特征
|
2025-03-01 10:33:24 +08:00 |
|
sxu
|
c4dff7ed37
|
分页查询人员及生物识别特征
|
2025-03-01 10:29:09 +08:00 |
|
sxu
|
9d7d107288
|
分页查询人员及生物识别特征
|
2025-03-01 10:25:24 +08:00 |
|
sxu
|
be78a0589b
|
fix ClassCastException
|
2025-03-01 10:13:22 +08:00 |
|
sxu
|
c164464e89
|
fix ClassCastException
|
2025-03-01 10:07:46 +08:00 |
|
sxu
|
c43b0e9597
|
系统区域权限树
|
2025-02-28 16:50:53 +08:00 |
|
sxu
|
34f2bc250c
|
fix bug
|
2025-02-28 15:30:09 +08:00 |
|
sxu
|
771a34bdde
|
更换报名
|
2025-02-27 17:31:27 +08:00 |
|
sxu
|
eddd948b2b
|
更换路径
|
2025-02-27 16:35:17 +08:00 |
|
sxu
|
49b6f87027
|
更换路径
|
2025-02-27 15:33:34 +08:00 |