1125/wanwenjings #2
Closed
wanwenjing
wants to merge 4 commits from
1125/wanwenjings into master
pull from: 1125/wanwenjings
merge into: teaching:master
teaching:1127/gaoxueci
teaching:1127/chengyingjie
teaching:1128/zhangyilun
teaching:1129/Fengmou
teaching:1127/donghongyang
teaching:1127/wangyaowen
teaching:1126/chenzhentwo
teaching:1202/zhuyufeng
teaching:1129/shangzhihao
teaching:1125/liuheping
teaching:1128/zhuyufeng
teaching:1129/donghongyang
teaching:1127/masongjia
teaching:1127/sujunlong
teaching:1127/cuifubo
teaching:1128/shangzhihao
teaching:1125/wuchang
teaching:1126/chenzhixv
teaching:1127/chenzhixv
teaching:1128/chenzhixv
teaching:12/1rh
teaching:121/yaohuanxi
teaching:master
teaching:1127/mengfankuo
teaching:1127/shangzhihao
teaching:1127/wangzhuo
teaching:1127/zhuyufeng
teaching:1127/sunly
teaching:1127/wuchang
teaching:1127/yangchaoshun
teaching:1127/mahaoran
teaching:1127/zhangshuaikang
teaching:1126/wangyaowen
teaching:1127/wanwenjing
teaching:1127/Fengmou
teaching:1127/yaohuanxi
teaching:1127/yudaoyang
teaching:1126/yaohuanxi
teaching:1126/masongjia
teaching:1126/donghongyang
teaching:1126/chengyingjie
teaching:1126/cuifubo
teaching:1126/mahaoran
teaching:1126/yangchaoshun
teaching:1126/Fengmou
teaching:11.27/rh
teaching:1125/chenzhixv
teaching:1125/zhuyufeng
teaching:1127/AoCi_Tian
teaching:1127/caihao
teaching:1127/yuehanhan
teaching:1126/mengfankuo
teaching:1126/yudaoyang
teaching:1127/liuheping
teaching:1126/zhangyilun
teaching:1125/cuifubo
teaching:1126/wangzhuo
teaching:1126/sunly
teaching:1126/zhuyufeng
teaching:1126/wuchang
teaching:1125/wangyaowen
teaching:1126/shangzhihao
teaching:1126/xyz
teaching:1125/wanwenjing
teaching:1125/AoCi_Tian
teaching:1126/AoCi_Tian
teaching:1125/mengfankuo
teaching:1125/chengyingjie
teaching:1125/caihao
teaching:1125/donghongyang
teaching:1125/mahaoran
teaching:1125/wangzhuo
teaching:1126/rh
teaching:1126/sujunlong
teaching:1127/rh
teaching:1125/gxc
teaching:1126/gxc
teaching:1125/Fengmou
teaching:1125/yudaoyang
teaching:1125/yuehanhan
teaching:1126/caihao
teaching:1125/xyz
teaching:1125/chenzhen
teaching:1125/dongzeliang
teaching:1125/masongjia
teaching:1125/rh
teaching:1125/shangzhihao
teaching:1125/sujunlong
teaching:1125/sunly
teaching:1125/yangchaoshun
teaching:1125/yaohuanxi
teaching:11/25/yudaoyang
teaching:1125/liuyanfeng
teaching:1125/zhangshuaikang
teaching:1125/zhangyilun
4 Commits (master)
| Author | SHA1 | Message | Date |
|---|---|---|---|
小万的gitee
|
49be23d2b6 | feat()：团购商品-团购添加完成了 | |
|
小万的gitee
|
e8a433bacd | feat()：团购商品-团购添加完成了 | |
|
小万的gitee
|
e0f9840709 |
Merge remote-tracking branch 'origin/1125/wanwenjing' into 1125/wanwenjing
# Conflicts: # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java |
|
DongZeLiang
|
090cf65bbe | feat()：团购商品-团购添加完成 |