Commits · e4d09c3de20d074f1f0ee16c430ca71ccfab2c8a · polysoft-nafmii / polysoft-parent

26 Apr, 2021 10 commits

冲突解决 · e4d09c3d
ypenglv committed Apr 26, 2021

e4d09c3d Browse Files
组件问题处理 · fa32d93b
ypenglv committed Apr 26, 2021

fa32d93b Browse Files
app用户登陆接口 · 1c3ef6d9
zhoujinghao committed Apr 26, 2021

1c3ef6d9 Browse Files
Merge remote-tracking branch 'origin/dev' into dev · 409961c8 ...
```
# Conflicts:
#	nafmii-app/src/main/java/org/nafmii/service/UserService.java
```
zhoujinghao committed Apr 26, 2021
409961c8 Browse Files
app用户注册相关代码提交 · 95536819
zhoujinghao committed Apr 26, 2021

95536819 Browse Files

Merge branch 'dev' of http://gitlab.polyhome.net/polysoft-nafmii/polysoft-parent into dev · bdf3b516 ...

# Conflicts:
#	nafmii-app/pom.xml
#	nafmii-app/src/main/java/org/nafmii/controller/UserController.java
#	nafmii-app/src/main/java/org/nafmii/service/UserService.java
#	nafmii-app/src/main/java/org/nafmii/service/impl/UserServiceImpl.java
#	nafmii-mbg/src/main/java/org/nafmii/nafmiimbg/model/CenterRole.java
#	nafmii-mbg/src/main/java/org/nafmii/nafmiimbg/model/CenterRoleExample.java
#	nafmii-mbg/src/main/resources/org/nafmii/nafmiimbg/mapper/CenterRoleMapper.xml

committed Apr 26, 2021

bdf3b516 Browse Files

Merge branch 'dev' of http://gitlab.polyhome.net/polysoft-nafmii/polysoft-parent into dev · 95cbb269 ...

# Conflicts:
#	nafmii-app/pom.xml
#	nafmii-app/src/main/java/org/nafmii/controller/UserController.java
#	nafmii-app/src/main/java/org/nafmii/service/UserService.java
#	nafmii-app/src/main/java/org/nafmii/service/impl/UserServiceImpl.java
#	nafmii-mbg/src/main/java/org/nafmii/nafmiimbg/model/CenterRole.java
#	nafmii-mbg/src/main/java/org/nafmii/nafmiimbg/model/CenterRoleExample.java
#	nafmii-mbg/src/main/resources/org/nafmii/nafmiimbg/mapper/CenterRoleMapper.xml

committed Apr 26, 2021

95cbb269 Browse Files

组件问题解决 · 9292bc5f
ypenglv committed Apr 26, 2021

9292bc5f
app用户注册相关代码提交 · fa74cfed
zhoujinghao committed Apr 26, 2021

fa74cfed
依赖修改 · 9cec0563
zhoujinghao committed Apr 26, 2021

9cec0563 Browse Files

25 Apr, 2021 18 commits
- 生成文件加入 · 8eb91097
  zhoujinghao committed Apr 25, 2021
  
  8eb91097
- 过滤器接口加入 · 6c1ebe95
  zhoujinghao committed Apr 25, 2021
  
  6c1ebe95 Browse Files
- 包结构修改 · f449c247
  zhoujinghao committed Apr 25, 2021
  
  f449c247 Browse Files
- jwt修改 · 26204cbf
  zhoujinghao committed Apr 25, 2021
  
  26204cbf Browse Files
- 提交配置类 · 23127a13
  “lxy” committed Apr 25, 2021
  
  23127a13
- jwt修改 · 7c50c135
  zhoujinghao committed Apr 25, 2021
  
  7c50c135 Browse Files
- 依赖修改 · a961ffd9
  zhoujinghao committed Apr 25, 2021
  
  a961ffd9 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · db7f0744
  zhoujinghao committed Apr 25, 2021
  
  db7f0744 Browse Files
- 注释修改 · 58abf45b
  zhoujinghao committed Apr 25, 2021
  
  58abf45b Browse Files
- 通用枚举和业务枚举 · 09278aaf
  ypenglv committed Apr 25, 2021
  
  09278aaf Browse Files
- 加入注释 · 281c961f
  zhoujinghao committed Apr 25, 2021
  
  281c961f Browse Files
- 加入注释 · f8366ba5
  zhoujinghao committed Apr 25, 2021
  
  f8366ba5 Browse Files
- 网关加入相关过滤器 · 191f6256
  zhoujinghao committed Apr 25, 2021
  
  191f6256 Browse Files
- 模拟用户操作相关接口提交 · 1d78b37e
  zhoujinghao committed Apr 25, 2021
  
  1d78b37e Browse Files
- 加入jwt相关代码 · a51fbed5
  zhoujinghao committed Apr 25, 2021
  
  a51fbed5
- common处理 · 783a34bc
  ypenglv committed Apr 25, 2021
  
  783a34bc Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f3053a30
  ypenglv committed Apr 25, 2021
  
  f3053a30 Browse Files
- common处理 · 34031532
  ypenglv committed Apr 25, 2021
  
  34031532 Browse Files
23 Apr, 2021 12 commits
- Merge branch 'master' into dev · f2fdb50b
  zhoujinghao committed Apr 23, 2021
  
  f2fdb50b Browse Files
- common处理 · 17adc532
  ypenglv committed Apr 23, 2021
  
  17adc532 Browse Files
- common处理 · f4a6d3ac
  ypenglv committed Apr 23, 2021
  
  f4a6d3ac
- 加入jwt依赖 · 16b50dd1
  zhoujinghao committed Apr 23, 2021
  
  16b50dd1 Browse Files
- 优化依赖 · f4657efc
  “lxy” committed Apr 23, 2021
  
  f4657efc Browse Files
- swagger · eca66102
  “lxy” committed Apr 23, 2021
  
  eca66102 Browse Files
- swagger · 884d259d
  “lxy” committed Apr 23, 2021
  
  884d259d Browse Files
- swagger · 9edbcec0
  “lxy” committed Apr 23, 2021
  
  9edbcec0 Browse Files
- swagger · e3d31c94
  “lxy” committed Apr 23, 2021
  
  e3d31c94 Browse Files
- 删除依赖 · a8a68713
  zhoujinghao committed Apr 23, 2021
  
  a8a68713 Browse Files
- swagger 提交 · 824cd642
  zhoujinghao committed Apr 23, 2021
  
  824cd642 Browse Files
- 相关依赖修改 · 3f3191d2
  zhoujinghao committed Apr 23, 2021
  
  3f3191d2 Browse Files