parent: a833e2 | patch | commitdiff
xiaoyong931011
2021-09-16 40393ae605bb5df6d4ffa136e13fd952bd936b29
refs
author xiaoyong931011 <15274802129@163.com>
Thursday, September 16, 2021 17:21 +0800
committer xiaoyong931011 <15274802129@163.com>
Thursday, September 16, 2021 17:21 +0800
commit40393ae605bb5df6d4ffa136e13fd952bd936b29
tree 225df18cd3c50651df536021bde33b24499a32a2 tree | zip | gz
parent a833e22f6a258dfb66358d281524927ce326fe69 view | diff
f5d14f3b3f5b4888308f1da8e92f1db040b9f791 view | diff 
Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

 Conflicts:
	src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
	src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
	src/main/resources/mapper/modules/MallMemberMapper.xml
5 files added
1 files renamed
7 files modified
392 ■■■■■ changed files
src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/utils/AppContants.java 18 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/utils/ShareCodeUtil.java 110 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ApiLoginController.java 15 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/LoginDto.java 24 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java 19 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java 14 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/ICommonService.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java 155 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java 6 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallMemberMapper.xml 11 ●●●●● diff | view | raw | blame | history