Stormeye Wu
3f043f2540
[admin端][新增]:admin端用户行为记录及数据升级脚本添加
7 лет назад
gongbiao
b55ccfda1e
[拼团][修改][待支付]
# Conflicts:
# mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
7 лет назад
Stormeye Wu
806fa4b2bc
[banner更新检查][修改]:宣传页下架不检查券状态
7 лет назад
gongbiao
9054592f48
[拼团][修改][待支付]
7 лет назад
gongbiao
097b1fa0fa
[拼团][修改][待支付]
7 лет назад
gongbiao
6da9a461c5
[拼团][修改][待支付]
# Conflicts:
# mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java
# mallinkService/src/main/java/com/iformall/service/WxOrderService.java
# mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
# mallinkService/src/main/resources/mapper/WxOrderMapper.xml
7 лет назад
gongbiao
10d54e9602
[拼团][修改][待支付]
7 лет назад
gongbiao
981d49c860
[拼团][修改][待支付]
7 лет назад
gongbiao
8214202f31
[拼团][修改][待支付]
7 лет назад
gongbiao
e846613703
[拼团][修改][待支付]
7 лет назад
gongbiao
ee6f8ce9d7
[拼团][修改][待支付]
7 лет назад
gongbiao
b04fbe3de1
[拼团][修改][待支付]
7 лет назад
gongbiao
39f59f9c06
[拼团][修改][待支付]
7 лет назад
gongbiao
12fdc7bddc
[拼团][修改][待支付]
7 лет назад
gongbiao
85d54954e9
[拼团][修改][待支付]
7 лет назад
gongbiao
ec47e96916
[拼团][修改][待支付]
7 лет назад
gongbiao
81b3805e17
[拼团][修改][待支付]
7 лет назад
gongbiao
d68e4a750c
[拼团][修改][待支付]
7 лет назад
Stormeye Wu
d6689219f4
[status获取][修改]:post改为get
7 лет назад
Stormeye Wu
1eb3e7ef0e
[卡完结][修改]:卡完结,merchant填0
7 лет назад
hupeng
9ca40aa808
Merge commit 'refs/tags/jenkins-back-end-1171^{}' into release
7 лет назад
luozukai
71cfd413f5
[营销数据][修改][砍价成功率加租户id]
7 лет назад
Stormeye Wu
4655f4fb12
Merge tag 'refs/tags/jenkins-back-end-1169' into release
develop
7 лет назад
Stormeye Wu
6782b3ae0a
[banner更新检查][修改]:添加检查
7 лет назад
hupeng
809a0f9307
Merge commit 'refs/tags/jenkins-back-end-1167^{}' into release
7 лет назад
hupeng
ac9b1d1d2a
[分账][修改]:增加订单查询判断
7 лет назад
hupeng
8da6fec0a5
[分账][修改]:增加订单查询判断
7 лет назад
hupeng
c13056aefa
Merge commit 'refs/tags/jenkins-back-end-1165^{}' into release
7 лет назад
hupeng
ccba393922
[分账][修复]:分账完结查询的问题
7 лет назад
luozukai
4249d514e2
Merge tag 'refs/tags/jenkins-back-end-1163' into release
develop
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
7 лет назад
luozukai
3290a1f85f
[预览账单][修改][调整生成预览账单逻辑]
7 лет назад
Stormeye Wu
c676f114eb
[前端参数检查][修改]:添加检查
7 лет назад
luozukai
3e9acf5d8b
Merge tag 'refs/tags/jenkins-back-end-1162' into release
develop
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
7 лет назад
hupeng
11903372d5
[商户][修改]:商户会员等级排序
7 лет назад
luozukai
e0fa3e65b7
[短信组件][修改][修改延迟消息问题]
7 лет назад
luozukai
2d17c6c55e
[短信组件][修改][修改延迟消息问题]
7 лет назад
hupeng
51c82c6926
Merge commit 'refs/tags/jenkins-back-end-1160^{}' into release
7 лет назад
luozukai
9691b29e71
[短信组件][修改][修改延迟消息问题]
7 лет назад
luozukai
a1629659a6
[短信组件][修改][修改延迟消息问题]
7 лет назад
luozukai
fd2b60137e
[短信组件][修改][修改延迟消息问题]
7 лет назад
luozukai
2d253c1c20
[短信组件][修改][修改延迟消息问题]
7 лет назад
luozukai
8bd1a8602a
[短信组件][修改][修改延迟消息问题]
7 лет назад
Stormeye Wu
18034aab6f
[TOKEN][调整]:用const代替数字
7 лет назад
Stormeye Wu
c3f7a9681e
[TOKEN][调整]:优化token及过期变量存放位置
7 лет назад
Stormeye Wu
5c32d7b3a0
[C端][优化]:C端获取信息优化,减少访问wx_c_user次数
7 лет назад
gongbiao
2de97d5da8
[短信][修改][字段]
7 лет назад
luozukai
f40074cc41
[短信组件][修改][修改延迟消息问题]
7 лет назад
Stormeye Wu
b4a6458540
[可转增状态检查][修改]:添加检查可转增状态update_date
7 лет назад
Stormeye Wu
bb9d4f3f9c
Merge tag 'refs/tags/jenkins-back-end-1154' into release
develop
7 лет назад
Stormeye Wu
1c5111ca5c
[补贴][修改]:补贴额出错问题
7 лет назад