1729 Commits

Author SHA1 Message Date
paulGao
096ab34ae8 fix: 优化文件上传,删除冗余文件 2022-11-22 15:29:22 +08:00
paulGao
65d9efef94 fix: 增加店员错误信息回
2022-11-18 10:15:50 +08:00
paulGao
f6a50cc43a fix: 修复下载商品导入模版错误问题 2022-11-17 18:36:04 +08:00
Chopper711
a13260b8c6 '楼层参数写入错误修正' 2022-11-14 09:44:53 +08:00
Chopper711
66c0200457 '商家楼层装修权限放开' 2022-11-14 09:31:20 +08:00
Chopper711
e244883165 '两个装修类合并' 2022-11-14 09:21:35 +08:00
Chopper711
92367c9020 '店铺保存模板配置问题处理' 2022-11-14 09:05:43 +08:00
Chopper711
e78ea60644 '限制演示站点部分功能' 2022-11-11 15:18:48 +08:00
Chopper711
29f73eaaa1 '楼层装修演示站点被覆盖问题处理' 2022-11-08 14:35:29 +08:00
OceansDeep
22c004a892
!250 pref: 优化es生成全部商品索引,减少数据库操作 优化文件
Merge pull request !250 from OceansDeep/feature/pg
2022-11-02 12:02:48 +00:00
paulGao
ef0507cf1d fix: 优化文件 2022-11-02 19:59:13 +08:00
paulGao
9df9e33ce1 fix: 优化代码 2022-11-02 19:54:57 +08:00
paulGao
52a2caaa6d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-11-02 19:43:44 +08:00
paulGao
0b6aa9e857 fix: 优化代码 2022-11-02 19:43:38 +08:00
paulGao
3b078cfd6b pref: 优化es生成全部商品索引,减少数据库操作 2022-11-02 19:43:17 +08:00
Chopper711
67b746998f
update README.md.
Signed-off-by: Chopper711 <1814994716@qq.com>
2022-10-31 03:04:13 +00:00
Chopper711
52f62f0c1d
update README.md.
Signed-off-by: Chopper711 <1814994716@qq.com>
2022-10-31 03:04:01 +00:00
Chopper711
ca23b5ab33 防重复提交问题å‘处理 2022-10-28 17:58:28 +08:00
Chopper711
5a14790ec2 平台脱敏 2022-10-28 17:33:06 +08:00
Chopper711
67542eebfb 用户信息脱敏 2022-10-28 16:58:30 +08:00
Chopper711
88c62bc238 用戶信息查看脫敏字段處理 2022-10-28 16:09:26 +08:00
Chopper711
0c4ed91335
update README.md.
Signed-off-by: Chopper711 <1814994716@qq.com>
2022-10-27 07:31:48 +00:00
Chopper711
74dbb611ab
update README.md.
Signed-off-by: Chopper711 <1814994716@qq.com>
2022-10-27 07:31:19 +00:00
Chopper711
07e72c7e72
!248 更新无法更新分销员待提现总金额的bug Merge pull request !248 from 隔壁老黄/tempbranch 2022-10-27 01:30:00 +00:00
chc
2c0700c10e lilishop.sql 2022-10-26 17:38:51 +08:00
Chopper711
191cee25a4
!246 fix: 限流次数不对 Merge pull request !246 from @xiaochangbai/pr/optime_lock
Merge pull request !246 from @xiaochangbai/pr/optime_lock
2022-10-26 09:26:19 +00:00
Chopper711
1b4fad72ed
!249 修改xxl-job合并冲突配置文件 Merge pull request !249 from 欢哥/master
Merge pull request !249 from 欢哥/master
2022-10-26 09:13:43 +00:00
code huan
3fce0dba48 fix 修改合并冲突文件 2022-10-26 14:58:55 +08:00
chc
706346338b 获取店铺首页 2022-10-25 19:13:03 +08:00
neo0820
aee846764b 更新无法更新分销员待提现总金额的bug 2022-10-25 19:00:59 +08:00
chc
391b35ef1f sql错误 2022-10-25 18:37:12 +08:00
蔡洪呈
9364841cf4
update README.md.
Signed-off-by: 蔡洪呈 <1501738723@qq.com>
2022-10-24 08:39:35 +00:00
OceansDeep
0d7b44fe51
!247 fix: 优化生成商品索引,取消检查库存不为0 优化es商品搜索及es商品特定查询条件的分页
Merge pull request !247 from OceansDeep/feature/pg
2022-10-24 06:40:33 +00:00
paulGao
47734cfca6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-10-24 14:38:08 +08:00
paulGao
a272e53519 fix: 优化es商品搜索及es商品特定查询条件的分页 2022-10-24 14:37:36 +08:00
xiaochangbai
710fe1998b fix: 限流次数不对 2022-10-21 17:36:26 +08:00
蔡洪呈
31c76c08b8
update pom.xml.
修改revision版本号

Signed-off-by: 蔡洪呈 <1501738723@qq.com>
2022-10-21 08:48:17 +00:00
chc
e8e2e8e315 v4.2.5 2022-10-21 11:27:28 +08:00
chc
5a1c6b9e7f v4.2.5 2022-10-21 11:26:55 +08:00
chc
1d98d8eecb 店员 2022-10-20 17:28:37 +08:00
paulGao
7d5e609f7b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-10-18 17:47:14 +08:00
paulGao
4d2cb2d1dc fix: 优化生成商品索引,取消检查库存不为0 2022-10-18 17:46:46 +08:00
OceansDeep
fa2806e3aa
!245 fix: 修复商品模版/商品草稿时,增加检查sku列表和配送规则列表不为空
Merge pull request !245 from OceansDeep/feature/pg
2022-10-18 02:35:59 +00:00
paulGao
761d9f45da fix: 修复商品模版/商品草稿时,增加检查sku列表和配送规则列表不为空 2022-10-18 10:34:33 +08:00
OceansDeep
07d9cfe5bc
!244 fix: 修复商品模版/商品草稿,保存批发规则无效问题
Merge pull request !244 from OceansDeep/feature/pg
2022-10-14 07:47:57 +00:00
paulGao
b9d7e0787c fix: 修复商品模版/商品草稿,保存批发规则无效问题 2022-10-14 10:31:47 +08:00
paulGao
4ea6660402 fix: 修复售后订单完成后没有返还优惠券问题 2022-10-14 10:30:27 +08:00
Chopper
8391596e2a Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-10-13 14:32:46 +08:00
Chopper
0f1cfc129c keys判定优化为精准判定 2022-10-13 14:32:40 +08:00
OceansDeep
3e33f9b363
!242 修复bug,优化代码
Merge pull request !242 from OceansDeep/feature/pg
2022-10-13 04:04:40 +00:00