712 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
dzc	86f1d09c4d	feat:订单状态搜索条件	2025-04-08 10:13:06 +08:00
dzc	c2013471ff	11	2025-04-07 19:55:27 +08:00
dzc	f57334703d	feat:手动更新智能柜库存	2025-04-07 18:34:10 +08:00
dzc	1ef76323cd	feat:商户交易记录搜索条件	2025-04-07 15:38:58 +08:00
dzc	54efb3a54a	Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud	2025-04-07 14:59:42 +08:00
dzc	be7daa58ee	feat:智能柜商品手动上架 ... feat:增加搜索条件	2025-04-07 14:59:38 +08:00
weiwei	d56b80398f	Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud	2025-04-07 11:47:09 +08:00
weiwei	8353852777	接口参数修改	2025-04-07 11:47:02 +08:00
dzc	e40cf86754	fix:框架bug	2025-04-07 10:53:23 +08:00
dzc	d809ddb23e	Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud	2025-04-07 10:32:06 +08:00
dzc	aedca7f627	fix:领导权限控制	2025-04-07 10:32:02 +08:00
weiwei	81960b123d	超市商户搜索修复	2025-04-03 20:23:40 +08:00
weiwei	9c9c405bd8	修复自营商家无法修改	2025-04-03 20:09:26 +08:00
weiwei	30716afea5	Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud	2025-04-03 19:18:17 +08:00
weiwei	520e07aaff	钱包类型选择权限	2025-04-03 19:18:10 +08:00
dzc	20c2d423fb	11	2025-04-03 19:12:40 +08:00
dzc	7c7a844bd5	111	2025-04-03 19:10:34 +08:00
dzc	03f911556e	11	2025-04-03 19:07:17 +08:00
dzc	95fec064e6	fix:转账上线修改	2025-04-03 17:37:40 +08:00
dzc	e823349e20	11	2025-04-03 17:12:07 +08:00
dzc	7d094a1c30	111	2025-04-03 15:34:53 +08:00
dzc	6e56d167de	feat:智能柜商品	2025-04-03 15:05:03 +08:00
dzc	24d03cf88e	feat:智能柜商品分类	2025-04-03 10:58:49 +08:00
dzc	ba54812e15	feat:路径修改	2025-04-02 19:49:50 +08:00
dzc	19a73776d2	Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud	2025-04-02 19:48:31 +08:00
dzc	68498f1c39	feat:智能柜代码生成	2025-04-02 19:48:26 +08:00
zjf	7685d0a93c	修改字段	2025-04-02 14:34:21 +08:00
zjf	e7ed2c8150	修改字段	2025-04-02 13:53:40 +08:00
zjf	6a5f85adc4	Merge remote-tracking branch 'origin/master'	2025-04-02 10:49:44 +08:00
zjf	b018c5bfac	商品导入	2025-04-02 10:49:29 +08:00
dzc	229950f075	11	2025-04-01 19:55:01 +08:00
dzc	dc87c053c6	feat:样式修改	2025-04-01 19:47:21 +08:00
dzc	438bfba46a	feat:转账权限	2025-04-01 19:45:10 +08:00
dzc	908772519d	feat:商户交易记录搜索条件	2025-04-01 19:34:23 +08:00
dzc	1ca9ee31ee	Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud	2025-04-01 19:02:20 +08:00
dzc	ca94dbafa9	11	2025-04-01 19:02:15 +08:00
zjf	977e3c02e8	Merge remote-tracking branch 'origin/master'	2025-04-01 18:49:46 +08:00
zjf	0d3d68c026	单点日志字段添加	2025-04-01 18:49:28 +08:00
dzc	d25e92460a	Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud	2025-04-01 18:29:40 +08:00
dzc	8824440446	feat:转账退款完成	2025-04-01 18:29:33 +08:00
weiwei	a7a910b2f3	Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud	2025-04-01 15:37:18 +08:00
weiwei	7fa9d6adbd	钱包充值钱包类型可选	2025-04-01 15:37:03 +08:00
dzc	2fab79f954	Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud	2025-04-01 12:56:55 +08:00
dzc	f3cf7a5054	feat:默认选中	2025-04-01 12:56:51 +08:00
zjf	e25aadb429	单点日志	2025-03-31 18:19:36 +08:00
weiwei	4f81f8bdc3	修改	2025-03-31 17:14:24 +08:00
weiwei	5e6d17b729	Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud	2025-03-31 16:35:46 +08:00
weiwei	7b75d9c1c7	流程修改	2025-03-31 16:35:41 +08:00
dzc	f243e0330a	Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud ... # Conflicts: # .env.development	2025-03-31 12:33:44 +08:00
dzc	6e6e16d890	feat:用户删除	2025-03-31 12:33:22 +08:00