268 Commits

Author SHA1 Message Date
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
fa70c743f8
!10 商品下载修改
Merge pull request !10 from 赵世界/feature
2022-08-17 05:41:53 +00:00
bdd41d4f28 feat: #10000 商品下载修改 2022-08-17 13:40:51 +08:00
1a44027349
!9 权限优化
Merge pull request !9 from feature
2022-08-17 03:23:16 +00:00
403c9f96b7 feat: #20220816 权限优化 2022-08-17 11:20:52 +08:00
a8cb514905
!8 商品下载
Merge pull request !8 from feature
2022-08-17 02:26:45 +00:00
96630e87bc
!7 测试修改
Merge pull request !7 from feature
2022-08-16 14:03:08 +00:00
1c89064f65 feat: #10000 权限seed优化 2022-08-16 21:26:15 +08:00
d8510155bb feat: #10000 增加商品下载接口 2022-08-16 21:15:15 +08:00
5e70ad8473 feat: #10000 测试修改 2022-08-16 21:02:31 +08:00
yezhenman
79cfae3a26 2022.8.16 2022-08-16 19:57:31 +08:00
6ad85f359d feat: #20220815 商品图片返回,增加文件上传权限 2022-08-16 18:24:56 +08:00
a283a73f21
!6 上线
Merge pull request !6 from 赵世界/feature
2022-08-15 15:17:05 +00:00
10685ca9d7 feat: #000000 第一次前端打包 2022-08-15 23:15:37 +08:00
yezhenman
f63d72a59a 2022.8.15 2022-08-15 19:55:44 +08:00
31e038b6ed feat: #10000 角色权限增加id 2022-08-15 16:15:00 +08:00
1002605449 feat: #10000 库存更新xiug 2022-08-15 10:43:49 +08:00
83901c8fcf
!5 master
Merge pull request !5 from develop
2022-08-15 01:52:48 +00:00
b9cb520740
!4 develop
Merge pull request !4 from feature
2022-08-15 01:52:18 +00:00
yezhenman
6d20a5648c 2022-8-12-提交 2022-08-12 18:26:27 +08:00
c3bb6f0054 feat: #10000 损耗更新 2022-08-12 17:52:28 +08:00
0d7a59217c feat: #10000 预留量修改增加校验 2022-08-12 17:45:33 +08:00
f497b36199 feat: #10000 商品库存总量逻辑同步
增加订单占用接口
2022-08-12 16:20:40 +08:00
46c59fe993 feat: #10000 权限修改,增加订单商品数量 2022-08-12 13:30:32 +08:00
a2eb9e27dd feat: #10000 账号重新授权 2022-08-11 18:47:35 +08:00
cf910fa6ae feat: #10000 更新库存队列修改 2022-08-11 18:34:16 +08:00
360cf5cf17 feat: #10000 日志查询修改 2022-08-11 18:09:15 +08:00
ee6e1fa09f feat: #10000 日志目标类型增加goods 2022-08-11 15:22:50 +08:00
a47657619d feat: #10000 日志目标类型增加goods 2022-08-11 15:01:35 +08:00
1a22edfd05 feat: #10000 更新库存增加事件监听和任务队列 2022-08-11 11:18:21 +08:00
804162083b feat: #10000 妙选订单推送优化 2022-08-11 05:11:14 +08:00
a7842b850d feat: #1000 妙选商品绑定 2022-08-11 04:06:38 +08:00
4819f823e4 feat: #10000 订单下载同步库存修改 2022-08-11 02:13:19 +08:00
a47fbb2622 feat: #10000 测试问题修改 2022-08-10 23:45:03 +08:00
5ebe7b685c feat: #10000 增量订单获取 2022-08-10 16:39:25 +08:00