Commit Graph

63 Commits

Author SHA1 Message Date
fengjh5 a14bbe7281 update 2024-05-21 09:28:23 +08:00
fengjh5 5a7e88c255 编辑用户钱包bug 2024-05-21 09:24:17 +08:00
fengjh5 034eb70046 包间 2024-05-15 16:20:06 +08:00
fengjh5 422ad40cde 评论 2024-05-14 18:05:24 +08:00
fengjh5 80e3ec1c8e 新增菜谱类型为包间的 2024-05-14 09:19:39 +08:00
fengjh5 2872f15778 update 2024-05-13 17:51:51 +08:00
fengjh5 5f51b161bf 包间管理页面 2024-05-13 16:35:15 +08:00
vguanyiwgd e122c4ac26 update
Change-Id: I5eae3e6e829803828a41c254432a4bd2d2f76242
2024-05-11 17:25:13 +08:00
vguanyiwgd fdf92ed3c9 东莞电信,增加指定用户类型才能使用
Change-Id: If629aecdc342be714c6e0ba600c9704eefc67d9c
2024-05-11 16:37:06 +08:00
vguanyiwgd 2eb79724ce update
Change-Id: Id5fa4e3e9e60f074d727b4ff740e95492e1ccaa0
2024-05-11 11:08:31 +08:00
vguanyiwgd b02c34c3b6 update
Change-Id: Id8bf884fa855957827669b5c9c2f18a0ecd64111
2024-05-11 09:56:44 +08:00
vguanyiwgd a6a6f1e94c 增加测试账号id
Change-Id: I4c44fe148f6261ee42a2b33819693090d28a002d
2024-05-10 16:04:27 +08:00
vguanyiwgd 338f5a71ac company_id =15 限制用户测试
Change-Id: Id60a0135a4c28964ca0237b0281c6ae1d49753a9
2024-05-10 15:37:59 +08:00
vguanyiwgd afb2f2fcb0 东莞电信 余额转移 限定账户
Change-Id: I5d8de3678f638d955adfe27022fda2058f42ba7b
2024-05-10 09:25:24 +08:00
vguanyiwgd 09a57a68b7 修复自动订餐 允许is_free=1 也可以自动订餐
Change-Id: Id483dd9bd6e11460c48ca4a0573ce7d3115c2510
2024-05-07 09:43:02 +08:00
fengjh5 e53396099b 包间后台 2024-05-07 08:52:22 +08:00
vguanyiwgd 9c70e8586b theme=2,增加vip围餐功能
Change-Id: I53231da8c8e7e58e6af4dba5ade98de7d7d284a3
2024-04-29 16:04:43 +08:00
vguanyiwgd 3ba4e84793 增加消费规则,每次消费优惠金额上限
Change-Id: I8ecd775d136f8aa503eea9cbe74a2ca89e8d76a0
2024-04-25 10:19:08 +08:00
vguanyiwgd 055b24d97e 自动订餐,不在订餐时间范围就不输出错误内容
Change-Id: I5aae573481ff1beb74dd9953ccfa14d434d67a5b
2024-04-23 11:23:17 +08:00
vguanyiwgd 95977e3cbf 自动订餐的代码修改,把写死的自动订餐时间改为读表,tb_meal_type_automatic_dc_time
Change-Id: I84b20f56a25d80807572d0eec5158038310d753b
2024-04-22 15:27:38 +08:00
vguanyiwgd 13ff407b47 update
Change-Id: I3676a70eafc75aebbb1d747a14298756046d9554
2024-04-22 11:42:53 +08:00
vguanyiwgd 486568e33b 增加 乐福米业 自动订餐接口,限制127.0.0.1才能调用
Change-Id: I6a765f5a4d265b109e061687395e1ff390ba8d9b
2024-04-22 11:02:49 +08:00
vguanyiwgd 7cf6f3a24d update
Change-Id: I3e480b28df585b36b82d62dd8e8d7a4e8546db2c
2024-04-19 11:36:15 +08:00
vguanyiwgd b280e96b7c 批量添加菜品,增加排序
Change-Id: Id816e439be57256b6468d8bcf75399a231382aa4
2024-04-19 09:58:25 +08:00
vguanyiwgd 755d30156e 修复index6 打开菜品的bug
Change-Id: Ic2e315ce1ec4b3c5cb2ea53f2203b716fe271d85
2024-04-18 17:30:55 +08:00
vguanyiwgd 1c50dee68f update
Change-Id: I5df244c0a03b416f5b74c9f339570a20247914ec
2024-04-17 17:00:25 +08:00
fengjh5 a9faff847a Merge branch 'master' of ssh://code.srdcloud.cn:29418/fsdxszhpt/yzms 2024-04-16 16:38:09 +08:00
fengjh5 8aad24dc1f 单个用户删除 2024-04-16 16:38:05 +08:00
vguanyiwgd 01ed6b4b24 update
Change-Id: I6bb9da09186f0380dc322c5527a97728c1f9fc37
2024-04-16 14:24:50 +08:00
vguanyiwgd c51be8f2cc update
Change-Id: I455ff4d80083f7a52f141083a0e761e24949fa32
2024-04-16 11:27:03 +08:00
vguanyiwgd 97129adf88 增加小程序登录后,同步更新openid 到 tb_user.applet_openid
Change-Id: Id41635e4ab2fbdc2cf845f96825b5144adcf2287
2024-04-16 10:13:40 +08:00
gyw 08e36f88d1 company_id=4151 对usermane 不默认脱敏
Change-Id: I26d45b11db9911ced0f3ab42de9ae7562494de45
2024-04-15 09:42:38 +08:00
hxchigd f6c7b1a5d5 userEdit用户名会被解密保存的bug临时修复 2024-04-13 22:16:15 +08:00
gyhanggd 39fc0e5a73 提交 2024-04-12 09:25:13 +08:00
gyhanggd 0bea212c5f 提交 2024-04-12 09:24:23 +08:00
fengjh5 a82654cc5c 用户姓名加密问题 2024-04-12 09:17:40 +08:00
vguanyiwgd 9f7b4d4916 修改index6的问题
Change-Id: Id02d52a7bf98353c557562dba4a8748471370ecc
2024-04-10 15:01:55 +08:00
vguanyiwgd 88f78c9db1 update
Change-Id: I1fb94a18b1fb480770da7ba133f21408fb3f540f
2024-04-09 15:52:02 +08:00
vguanyiwgd 3e222fc84e update
Change-Id: Id2225a5c0601cee022d3e821e264e51466550eb5
2024-04-09 15:42:06 +08:00
vguanyiwgd b98e7bccd9 update
Change-Id: I0902bd13d2f03b5da9ea78692aefe7765d7285c4
2024-04-09 15:28:02 +08:00
fengjh5 6f84de4e6e Merge branch 'master' of ssh://code.srdcloud.cn:29418/fsdxszhpt/yzms 2024-04-09 15:21:01 +08:00
fengjh5 70b8cc17a4 现金充值页面 2024-04-09 15:20:57 +08:00
vguanyiwgd 88d4f22935 update
Change-Id: I2aad3444326304753e3814e7b717d29172459662
2024-04-09 14:46:58 +08:00
fengjh5 7f34860e90 Merge branch 'master' of ssh://code.srdcloud.cn:29418/fsdxszhpt/yzms 2024-04-09 14:20:15 +08:00
fengjh5 7815eba1ce update 2024-04-09 14:19:52 +08:00
vguanyiwgd dd67d35e4b 增加珠海定制主题,theme6
Change-Id: I921f5565746f458ef0e9e4ecce6dd75745b4b8d0
2024-04-09 14:13:27 +08:00
fengjh5 9d294c213b 测试 2024-04-08 17:35:43 +08:00
vguanyiwgd 7254bebf9a 修改,科汇的购物车备注
Change-Id: I92b461212f7878ff51bd6603afb2e07e9848c222
2024-04-07 11:15:22 +08:00
vguanyiwgd dae92e070d no message
Change-Id: I6c613613b06016af012343496504eb23537f576c
2024-04-03 11:27:32 +08:00
vguanyiwgd 6c03627c63 在tb_meal_type 增加allow_date_multi 自定义控制是否可以多订餐
Change-Id: Ib6a4acda3d6a056b022699a7853840ff33d717a3
2024-04-03 11:18:00 +08:00