160 Commits

Author SHA1 Message Date
466bf076e0
!49 8.22修改首页编辑图片bug及优化默认下架
Merge pull request !49 from yezhenman
2022-08-22 09:51:11 +00:00
d1dc9adf0d feat: #10000 用户取消邮箱验证 2022-08-22 17:47:17 +08:00
ab580a1c91 feat: #100000 只有非下架商品库存才可同步 2022-08-22 17:23:52 +08:00
yezhenman
9755d297a1 8.22修改首页编辑bug 2022-08-22 17:17:30 +08:00
c04bb104a0 fix: #10000 导入数据格式化 2022-08-22 16:10:50 +08:00
89717763ca
!46 8.20晚上首页分页优化筛选优化
Merge pull request !46 from yezhenman
2022-08-20 10:08:48 +00:00
yezhenman
ccf0a52226 8.20 last 2022-08-20 18:07:01 +08:00
275ed78ec7
!45 8.20下午修复分页筛选
Merge pull request !45 from yezhenman
2022-08-20 10:03:52 +00:00
4e43c37511 feat: #100000 库存编辑同步 2022-08-20 18:02:23 +08:00
yezhenman
3d828ebad8 8.20下午首页分页优化及其他 2022-08-20 17:51:59 +08:00
fcbf67f2a3 feat: #10000 日志记录优化 2022-08-20 17:44:14 +08:00
f95516e182 feat: 2022-08-20 16:33:57 +08:00
72ffbbc40d feat: #10000 库存更新修改 2022-08-20 15:45:40 +08:00
80e63ec32d feat: #10000 多个团购库存同步 2022-08-20 15:28:15 +08:00
1aa9af74ab Merge branch 'develop' of gitee.com:hzchunfen/erp into develop 2022-08-20 14:55:33 +08:00
cde2baf7ce feat: #100000 更新库存编码修改 2022-08-20 14:55:11 +08:00
3014c8cfa7
!39 8.20修复分页以及按钮,新增首页规格字段
Merge pull request !39 from yezhenman
2022-08-20 05:43:14 +00:00
f826eb12ed feat: #10000 优化 2022-08-20 13:42:22 +08:00
yezhenman
cd6643cf90 8.20新增首页规格字段 2022-08-20 10:57:38 +08:00
yezhenman
2f44dd08ee 8.20修复分页以及按钮 2022-08-20 10:17:22 +08:00
03f8f23c83 fix: #10000 分页修改,商品导入修改 2022-08-19 22:52:04 +08:00
3aa343aa21
!36 8.19 优化侧边栏 首页筛选 分页功能
Merge pull request !36 from yezhenman
2022-08-19 14:32:42 +00:00
yezhenman
ca162234a3 8.19 last 2022-08-19 19:28:37 +08:00
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
5a2ef8745f feat: #20220819 代码优化 2022-08-19 10:54:13 +08: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
31590426e8 feat: #10000 店铺订单修改 2022-08-18 14:57:38 +08:00
b774245cf6 feat: #20220818 订单获取日志记录修改 2022-08-18 13:20:55 +08:00
73e28e6caf feat: #20220818 妙选商城库存同步修改 2022-08-18 12:44:03 +08:00
c67ea8380e feat: #10000 代码优化 2022-08-18 11:22:27 +08:00
2de3c6b8bf feat: #10000 库存同步修改,索引优化 2022-08-18 11:08:13 +08:00
ed5fd2f5f2 feat: #10000 错误修改 2022-08-17 20:52:44 +08:00
068122f3f0 feat: #10000 数据传递使用数组 2022-08-17 20:50:03 +08: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
9356d9b68d feat: #10000 日志记录字段更新 2022-08-17 18:42:40 +08:00
15275b399c feat: #100000 预留量修改 2022-08-17 18:34:27 +08:00
1d7c694fbd feat: #10000 库存修改 2022-08-17 17:17:14 +08: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
ea355d3395 fix: #10000 校验规则修改 2022-08-17 16:01:46 +08: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