Commit Graph

4885 Commits (master)

Author SHA1 Message Date
TianYu d5167b3e35 fix: 提成设置可以输入两位小数 2023-06-02 09:53:16 +08:00
tianyu 1aca869225 Merge pull request 'fix: 提成设置可以输入两位小数' (#11) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/11
2023-06-02 09:53:09 +08:00
tangqian a1321eaca1 fix: 修改部门 2023-06-01 19:06:27 +08:00
tangqian cf897c2b9c fix: 修改部门 2023-06-01 18:46:06 +08:00
tangqian 7f980191d1 Merge branch 'feature/mall_product' 2023-06-01 17:35:38 +08:00
tangqian ced99434c1 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-01 17:35:24 +08:00
tangqian 0512c04391 fix: 修改部门 2023-06-01 17:35:18 +08:00
TianYu 1fcfc530fb fix: 修复bug 2023-06-01 17:01:28 +08:00
tianyu 774ba45aff Merge pull request 'fix: 修复bug' (#10) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/10
2023-06-01 17:01:27 +08:00
tianyu f76bc2e3e6 Merge pull request 'feature/mall_product' (#9) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/9
2023-06-01 14:22:41 +08:00
TianYu 45779d8252 fix: 修复bug 2023-06-01 14:21:31 +08:00
Jruome 8748e0dcc9 uniapp 购买记录样式修改 2023-06-01 14:16:20 +08:00
tangqian 07d811caeb Merge branch 'feature/mall_product' 2023-06-01 14:11:37 +08:00
tangqian b168d8a899 fix: 修改部门 2023-06-01 14:11:28 +08:00
tangqian cb280da42f Merge branch 'feature/mall_product' 2023-06-01 13:26:47 +08:00
tangqian 2fc7ef07f8 fix: 修改部门 2023-06-01 13:26:31 +08:00
perry 4ec7e8d409 Merge remote-tracking branch 'origin/master' 2023-06-01 13:14:08 +08:00
perry 266f6bec1c 所有部门 2023-06-01 13:13:10 +08:00
tangqian 2c4c96cfa4 Merge branch 'feature/mall_product' 2023-06-01 12:03:26 +08:00
tangqian b821587935 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-01 12:02:51 +08:00
tangqian 236d4b566b fix: 修改部门 2023-06-01 12:02:45 +08:00
TianYu 1301b5d9ea Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-06-01 11:53:36 +08:00
TianYu 55abca5129 fix: 新增扫码关注公众号功能 2023-06-01 11:53:24 +08:00
tangqian a1f6946fc4 fix: 修改部门 2023-06-01 11:45:43 +08:00
tangqian d441005778 Merge branch 'feature/mall_product' 2023-06-01 11:43:54 +08:00
tangqian e97a387aa5 fix: 修改部门 2023-06-01 11:43:28 +08:00
perry 296af91986 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-06-01 11:29:43 +08:00
perry 144e858710 部门 2023-06-01 11:29:32 +08:00
tangqian bec5e56add fix: 修改部门 2023-06-01 11:27:49 +08:00
tangqian 5a5c69421c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-01 11:27:17 +08:00
tangqian 06a0f96bf1 fix: 修改部门 2023-06-01 11:27:11 +08:00
Jruome 9326a31489 uniapp 时间戳转换 2023-06-01 11:25:20 +08:00
Jruome d6ea232b81 uniapp 时间戳转换 2023-06-01 11:24:27 +08:00
tangqian f847c508ae Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-01 11:24:25 +08:00
tangqian 451747bd24 fix: 修改部门 2023-06-01 11:24:18 +08:00
perry ad21968346 抽佣 2023-06-01 10:52:55 +08:00
TianYu 46686e4467 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-31 18:15:31 +08:00
TianYu d904d0b6de fix: 调整样式 2023-05-31 18:15:19 +08:00
tianyu 8d3ca8ee1b Merge pull request 'feature/mall_product' (#8) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/8
2023-05-31 18:15:16 +08:00
tangqian d7787d3193 fix: 修改部门 2023-05-31 18:10:48 +08:00
tangqian 45980a8c79 fix: 修改部门 2023-05-31 18:08:01 +08:00
tangqian a37b5f0fcc fix: 修改部门 2023-05-31 18:02:53 +08:00
tangqian 4a2765bd1b Merge branch 'feature/mall_product' 2023-05-31 17:46:31 +08:00
tangqian a4e18f6c9c fix: 修改后台相关 2023-05-31 17:44:13 +08:00
tangqian 3ea7926767 Merge branch 'feature/mall_product' 2023-05-31 17:29:41 +08:00
tangqian b86128c836 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-31 17:29:30 +08:00
tangqian 9f9cb30b03 fix: 修改后台相关 2023-05-31 17:29:24 +08:00
tianyu da15156869 Merge pull request 'feature/mall_product' (#7) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/7
2023-05-31 17:22:06 +08:00
TianYu 56c643d785 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-31 17:21:26 +08:00
TianYu c2debf6b82 feat: 增加用户协议 2023-05-31 17:21:08 +08:00