个人信息修改-登陆皮肤及首页布局改为下拉框在青海项目下更改
v.ddicCode=="loginSkin"以及v.ddicCode=="userLayout"的输入框为下拉选择,D:\work\honggroup\hg-monitor-web\hg-monitor-web-qh\src\main\resources\static\src\controller\userChange.js line 260
v.ddicCode=="loginSkin"以及v.ddicCode=="userLayout"的输入框为下拉选择,D:\work\honggroup\hg-monitor-web\hg-monitor-web-qh\src\main\resources\static\src\controller\userChange.js line 260
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b master-500-dev-lushangqing origin/master-500-dev-lushangqing
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout master-500-dev git merge --no-ff master-500-dev-lushangqing
Step 4. Push the result of the merge to GitLab
git push origin master-500-dev
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines
The changes were merged into master-500-dev.