1517874642
|
16291908d4
|
更新审核信息
|
4 jaren geleden |
1517874642
|
e3421d41cf
|
合同用户线索
|
4 jaren geleden |
yeqd
|
17003f310b
|
Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev
|
4 jaren geleden |
yeqd
|
38e783f144
|
过滤修改和添加的时候不要的字段
|
4 jaren geleden |
1517874642
|
40b2ddb983
|
根据用户手机号查询用户信息
|
4 jaren geleden |
1517874642
|
1bd68f10ef
|
Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev
|
4 jaren geleden |
1517874642
|
479c4096a9
|
fix:添加审核人姓名;审核时更新记录、添加企业时新增记录;站点管理添加地址;解决出现的bug
|
4 jaren geleden |
yeqd
|
126b54cf45
|
修改电工和班组相关逻辑
|
4 jaren geleden |
yeqd
|
7a686d4c81
|
Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev
|
4 jaren geleden |
yeqd
|
14332f2a4d
|
添加班组接口
|
4 jaren geleden |
1517874642
|
07eabd8263
|
fix:可以更新账号companyId为null
|
4 jaren geleden |
yeqd
|
24b4b48cce
|
添加电工的接口
|
4 jaren geleden |
yeqd
|
313e5e1e01
|
添加电工添加接口
|
4 jaren geleden |
1517874642
|
dbfc2181a0
|
Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev
|
4 jaren geleden |
1517874642
|
d0ab3ddd56
|
fix:删除服务商时要删除所有服务商与企业的对应关系
|
4 jaren geleden |
yeqd
|
3b4912c2fd
|
Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev
# Conflicts:
# user-service/src/main/java/com/hp/user/service/impl/AccountServiceImpl.java
# user-service/src/test/java/com/hp/user/service/ControllerTest.java
|
4 jaren geleden |
yeqd
|
486651f390
|
测试类
|
4 jaren geleden |
yeqd
|
398739a16b
|
添加字典表的查询接口
|
4 jaren geleden |
1517874642
|
5d51a043ee
|
更改HttpResult、设置account备注字段
|
4 jaren geleden |
yeqd
|
767fec3f4c
|
Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev
# Conflicts:
# user-client/src/main/java/com/hp/user/client/entity/AccountVO.java
# user-service/src/main/java/com/hp/user/service/impl/AccountServiceImpl.java
|
4 jaren geleden |
yeqd
|
9559f677c2
|
添加接口返回类以及添加微信相关的工具类
|
4 jaren geleden |
1517874642
|
d52b7effcc
|
企业关联服务商
|
4 jaren geleden |
1517874642
|
eb73a474a4
|
服务商账号管理
|
4 jaren geleden |
yeqd
|
3db5427eed
|
Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev
|
4 jaren geleden |
yeqd
|
24362bd3a3
|
添加不完整的微信认证
|
4 jaren geleden |
yeqd
|
d9b4657d04
|
提交
|
4 jaren geleden |
1517874642
|
c475265d47
|
Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev
# Conflicts:
# user-service/src/main/java/com/hp/user/service/entity/Account.java
|
4 jaren geleden |
1517874642
|
cead0e0bc7
|
fix:修改字段后,服务商/企业API修改
|
4 jaren geleden |
yeqd
|
648538b080
|
Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev
|
4 jaren geleden |
yeqd
|
ce4902508e
|
添加账号相关接口
|
4 jaren geleden |
1517874642
|
caa392ef54
|
fix
|
4 jaren geleden |
1517874642
|
acba81e154
|
fix
|
4 jaren geleden |
1517874642
|
3b3854655c
|
Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev
# Conflicts:
# user-service/src/main/java/com/hp/user/service/utils/HttpResult.java
|
4 jaren geleden |
1517874642
|
3e17d7b0d8
|
成为合同用户、服务地址管理、企业认证
|
4 jaren geleden |
yeqd
|
9d81b83d39
|
修改
|
4 jaren geleden |
yeqd
|
b262fa6228
|
Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev
|
4 jaren geleden |
yeqd
|
c585a0787f
|
添加短信
|
4 jaren geleden |
1517874642
|
9f0e3ec87a
|
站点信息管理
|
4 jaren geleden |
1517874642
|
4aefe47755
|
企业/服务商信息管理
|
4 jaren geleden |
1517874642
|
1ce5faee2b
|
fix
|
4 jaren geleden |
1517874642
|
a9b226d838
|
Merge branch 'dev' of http://47.104.91.134:3000/yeqd/user-parent into dev
# Conflicts:
# user-service/src/main/java/com/hp/user/service/UserServiceApplaction.java
# user-service/src/main/java/com/hp/user/service/config/SwaggerConfig1.java
|
4 jaren geleden |
1517874642
|
ff5cf1e6a6
|
企业管理
|
4 jaren geleden |
yeqd
|
42c9261a99
|
添加id生成器,redis,messageController
|
4 jaren geleden |
yeqd
|
02f70a9204
|
删除多余的代码
|
4 jaren geleden |
yeqd
|
999f620efe
|
Merge branch 'dev' of http://47.104.91.134:3000/yeqd/user-parent into dev
# Conflicts:
# user-service/src/main/java/com/hp/user/service/config/SwaggerConfig.java
|
4 jaren geleden |
yeqd
|
53834ff5e1
|
提交解决swagger无效的问题
|
4 jaren geleden |
yeqd
|
19d124376b
|
添加
|
4 jaren geleden |
1517874642
|
1e48fb1162
|
Merge branch 'dev' of http://47.104.91.134:3000/yeqd/user-parent into dev
# Conflicts:
# user-service/pom.xml
# user-service/src/main/java/com/hp/user/service/controller/AreaController.java
|
4 jaren geleden |
1517874642
|
5e4a2e3d7f
|
swagger
|
4 jaren geleden |
1517874642
|
7aa76e5268
|
swagger
|
4 jaren geleden |