王怡栋 444834b316 Merge branch 'sprint/zentaopms240' into 'sprint/zentaopms240_lanzongjun' ...

# Conflicts:
#   module/custom/js/mode.js
#   module/custom/lang/de.php
#   module/custom/lang/en.php
#   module/custom/lang/fr.php
#   module/custom/lang/zh-cn.php
#   module/custom/view/mode.html.php
#   module/project/control.php
#   module/project/lang/zh-cn.php

2022-09-27 00:28:36 +00:00

..

css

Merge branch 'sprint/zentaopms240' into 'sprint/zentaopms240_lanzongjun'

2022-09-27 00:28:36 +00:00

js

…

lang

* Finish task #70192.

2022-09-26 06:44:02 +00:00

view

* Finish task #70192.

2022-09-26 06:44:02 +00:00

config.php

…

control.php

* Finish task #70200.

2022-09-26 09:38:11 +00:00

model.php

* Finish task #70200.

2022-09-26 09:38:11 +00:00

systemfiles.txt

…