李玉春 9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283' ...

# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php

2022-02-23 01:33:37 +00:00

..

css

…

js

…

lang

…

view

Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'

2022-02-23 01:33:37 +00:00

config.php

…

control.php

* show only groups of current vision on user create, bug #18849.

2022-02-22 14:52:36 +08:00

model.php

* Move die to return.

2022-02-22 14:15:00 +08:00