luying 5cfd22bbf4 Merge branch 'feature/hero' of gitlab.trgame.cn:zyztech/zyz_server ...

Conflicts:
	shared/consts/consts.ts
	shared/db/Role.ts
	web-server/app/service/Auth.ts

2020-12-14 11:17:02 +08:00

..

consts

Merge branch 'feature/hero' of gitlab.trgame.cn:zyztech/zyz_server

2020-12-14 11:17:02 +08:00

db

Merge branch 'feature/hero' of gitlab.trgame.cn:zyztech/zyz_server

2020-12-14 11:17:02 +08:00

pubUtils

Merge branch 'feature/hero' of gitlab.trgame.cn:zyztech/zyz_server

2020-12-14 11:17:02 +08:00

resource

武将战力更新，更新表json

2020-12-12 17:40:37 +08:00