2024/11/04修改接口和配置文件
2024/11/04修改接口 1.为总任务的实体类添加字段 enterpriseId、enterpriseName用于获取企业名称和企业id。 2.修改配置文件 token有效时长由30分钟变为120分钟。 3.将TaskServiceImpl层editTask方法中judgmentSample方法注掉,此时生产企业 由任务发起的时候直接赋值。
2024/11/04修改接口 1.为总任务的实体类添加字段 enterpriseId、enterpriseName用于获取企业名称和企业id。 2.修改配置文件 token有效时长由30分钟变为120分钟。 3.将TaskServiceImpl层editTask方法中judgmentSample方法注掉,此时生产企业 由任务发起的时候直接赋值。
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b songyuanshuo origin/songyuanshuo
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout origin/dev git merge --no-ff songyuanshuo
Step 4. Push the result of the merge to GitLab
git push origin dev
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
This will create a new commit in order to revert the existing changes.