Chopper 35af0f2744 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui ... # Conflicts: # manager/src/views/promotion/coupon/coupon.vue # seller/src/views/promotion/coupon/coupon.vue		2021-05-24 15:45:46 +08:00
..
app-version	修改一些bug完善，新增app更新新功能	2021-05-21 16:45:47 +08:00
department-manage	添加注释	2021-05-14 12:01:24 +08:00
instant-delivery	添加注释	2021-05-14 12:01:24 +08:00
log-manage	添加注释	2021-05-14 12:01:24 +08:00
menu-manage	修改bug，更改字体图标	2021-05-18 18:03:00 +08:00
message	解决发送短信的问题	2021-05-18 18:02:25 +08:00
monitor	添加注释	2021-05-14 12:01:24 +08:00
oss-manage	radio全局样式调整	2021-05-17 18:07:19 +08:00
role-manage	radio全局样式调整	2021-05-17 18:07:19 +08:00
setting-manage	调整页面细节	2021-05-24 15:44:50 +08:00
slider	commit message	2021-05-13 10:56:04 +08:00
user-manage	添加注释	2021-05-14 12:01:24 +08:00