752 Commits

Author SHA1 Message Date
c619ee3989
!34 8.19优化侧边栏
Merge pull request !34 from yezhenman
2022-08-19 09:26:44 +00:00
yezhenman
afb114cd4e 8.19优化侧边栏 2022-08-19 17:19:00 +08:00
2f4b148d4c
!33 代码优化
Merge pull request !33 from develop
2022-08-19 02:55:53 +00:00
5a2ef8745f feat: #20220819 代码优化 2022-08-19 10:54:13 +08:00
3e3fb75beb
!32 develope
Merge pull request !32 from develop
2022-08-18 12:03:06 +00:00
622467c64c
!31 8.18晚上合并
Merge pull request !31 from yezhenman
2022-08-18 12:01:37 +00:00
yezhenman
04a4abe7c7 Merge branch 'develop' into yezhenman 2022-08-18 19:22:45 +08:00
yezhenman
e88f3b1442 8.18 to 2 2022-08-18 19:21:45 +08:00
yezhenman
15d5126b7b 8.18bug 2022-08-18 18:04:59 +08:00
3cb73453fb
!29 店铺订单修改
Merge pull request !29 from develop
2022-08-18 08:02:00 +00:00
31590426e8 feat: #10000 店铺订单修改 2022-08-18 14:57:38 +08:00
d5ba45bad2
!28 订单获取日志记录修改
Merge pull request !28 from develop
2022-08-18 06:32:25 +00:00
2e37befdda
!27 妙选商城库存同步推送修改
Merge pull request !27 from develop
2022-08-18 05:58:40 +00:00
b774245cf6 feat: #20220818 订单获取日志记录修改 2022-08-18 13:20:55 +08:00
73e28e6caf feat: #20220818 妙选商城库存同步修改 2022-08-18 12:44:03 +08:00
ed1310b1e2
!26 代码优化
Merge pull request !26 from develop
2022-08-18 03:23:15 +00:00
c67ea8380e feat: #10000 代码优化 2022-08-18 11:22:27 +08:00
b9ef5270d5
!25 库存同步修改
Merge pull request !25 from develop
2022-08-18 03:09:35 +00:00
2de3c6b8bf feat: #10000 库存同步修改,索引优化 2022-08-18 11:08:13 +08:00
f9462533f4
!24
Merge pull request !24 from develop
2022-08-17 12:53:19 +00:00
ed5fd2f5f2 feat: #10000 错误修改 2022-08-17 20:52:44 +08:00
53f04a2c7f
!23 数据传递使用数组
Merge pull request !23 from develop
2022-08-17 12:51:01 +00:00
068122f3f0 feat: #10000 数据传递使用数组 2022-08-17 20:50:03 +08:00
564af7f9b7
!22 develop
Merge pull request !22 from develop
2022-08-17 11:20:34 +00:00
971517e578
!21 8.17晚上合并
Merge pull request !21 from yezhenman
2022-08-17 11:19:33 +00:00
yezhenman
cb717f0991 8.17晚上 2022-08-17 19:16:28 +08:00
32d6a25bfd
!20 1
Merge pull request !20 from develop
2022-08-17 10:43:39 +00:00
9356d9b68d feat: #10000 日志记录字段更新 2022-08-17 18:42:40 +08:00
15275b399c feat: #100000 预留量修改 2022-08-17 18:34:27 +08:00
3d32adf1d7
!19 库存修改
Merge pull request !19 from develop
2022-08-17 09:18:46 +00:00
1d7c694fbd feat: #10000 库存修改 2022-08-17 17:17:14 +08:00
bc4d771ced
!18 master
Merge pull request !18 from develop
2022-08-17 08:29:07 +00:00
595475d294
!17 8.17下午实验合并第二次
Merge pull request !17 from yezhenman
2022-08-17 08:27:49 +00:00
yezhenman
0fd6d14856 8.17 to 4 2022-08-17 16:26:10 +08:00
yezhenman
27495008a5 Merge branch 'yezhenman' of gitee.com:hzchunfen/erp into yezhenman 2022-08-17 16:23:12 +08:00
yezhenman
a84b853fd5 8.17 to 3 2022-08-17 16:22:36 +08:00
c18f939810 feat: #10000 图片路径修改 2022-08-17 16:21:07 +08:00
028b33d81c
!16 10000
Merge pull request !16 from 赵世界/develop
2022-08-17 08:09:12 +00:00
ea355d3395 fix: #10000 校验规则修改 2022-08-17 16:01:46 +08:00
54f6fb5a53
!15 develop
Merge pull request !15 from 赵世界/develop
2022-08-17 07:52:16 +00:00
yezhenman
3734fdea34 Merge branch 'develop' of gitee.com:hzchunfen/erp into yezhenman
Signed-off-by: yezhenman <691226925@qq.com>
2022-08-17 07:45:34 +00:00
04f2a54b1e feat: #10000 删除多余目录 2022-08-17 15:42:17 +08:00
0dca6fe592
!14 8.17下午实验合并
Merge pull request !14 from yezhenman/yezhenman
2022-08-17 07:49:03 +00:00
yezhenman
6a0f198cad 8.17下午提交 2022-08-17 15:41:48 +08:00
yezhenman
bfecf71d08 8.17下午 2022-08-17 15:40:04 +08:00
2d61692fec
!13 master
Merge pull request !13 from 赵世界/master
2022-08-17 07:39:49 +00:00
a07a67ea4a
!12 商品转入
Merge pull request !12 from 赵世界/feature
2022-08-17 06:49:06 +00:00
b0f267c52a feat: #10000 增加商品下载 转录到本地商品 2022-08-17 14:47:58 +08:00
61a36fb06b
!11 修改
Merge pull request !11 from 赵世界/feature
2022-08-17 05:55:26 +00:00
1f3e502f1b fix: #10000 库存同步修改 2022-08-17 13:49:36 +08:00