18 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
root 5af7b9f5aa Merge remote-tracking branch 'remotes/origin/feature/20200514_version' into dev
# Conflicts:
#	src/main/resources/application-test.yml
6 years ago
LegnaYet c6443159b2 门店号管理 6 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
yechenhao b7554fda65 大屏接口 6 years ago
zhenghuang 2b357e8624 swagger mysql 6 years ago
kevin jiang e35a216ce0 去掉无用依赖包。 6 years ago
yechenhao a38a41ca1d 大屏接口 6 years ago
LegnaYet 33b003e4c3 大屏接口,清除客户数据接口 6 years ago
LegnaYet 2f6c59e0ad 同步客户统计数据 6 years ago
kevin jiang 8bdf0b4a88 微信授权登录,判空处理。 6 years ago
kevin jiang 6e4a4726f9 微信授权功能代码。 6 years ago
wangweijia 2c20977d15 bug修改 6 years ago
Caps 28541c3216 客户回调接口 6 years ago
yechenhao 694c861ed0 门店、导购二维码下载 6 years ago
wangweijia a1931da18f 增加导入店铺,导购,vip接口 6 years ago
Caps 9847cf4f9e 客户回调接口 6 years ago
LegnaYet 95b336ef50 员工部门增加 6 years ago