14 Commits (5e192fa3da16e6f23906475f76312199e1be7410)

Author SHA1 Message Date
root 506fc95c0e Merge remote-tracking branch 'remotes/origin/feature/20200531'
# Conflicts:
#	src/main/java/com/kiisoo/ic/customer/CustomerService.java
#	src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
#	src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java
#	src/main/java/com/kiisoo/ic/synchronous/service/PromotionCodeService.java
#	src/main/resources/application-dev.yml
#	src/test/java/test/Test.java
5 years ago
kevin jiang ee86a02690 redis 5 years ago
yechenhao eb655e1d22 Redis 5 years ago
yechenhao 0b667f4acb 改为set 5 years ago
kevin jiang f51ce39cab redis 5 years ago
kevin jiang e4bfc12085 redis 5 years ago
kevin jiang d4620b70b3 Merge branch 'master' into feature/20200514_version
# Conflicts:
#	src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java
6 years ago
kevin jiang 9acb88ed69 添加组织和店铺的接口。 6 years ago
kevin jiang e35a216ce0 去掉无用依赖包。 6 years ago
wangweijia 16e2b9b3e9 加入队列 6 years ago
LegnaYet 9c80065385 门店号推广 6 years ago
LegnaYet 7493d98c68 导入excel 6 years ago
Caps 34c7c74b4a 账户权限管理 6 years ago
kevin jiang a992b75005 添加企业微信功能代码。 6 years ago