Merge branch 'main' into uat_us

1
2025-01-23 18:41:20 +08:00 · 2025-01-23 18:40:25 +08:00 · 2025-01-23 16:37:18 +08:00 · 2025-01-23 14:06:28 +08:00 · 2025-01-23 13:03:36 +08:00 · 2025-01-22 15:29:37 +08:00
30 changed files with 98 additions and 158 deletions
@@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-30/'
+VUE_APP_BASE_PATH = 'https://ei-med-s3-uat-code.s3.amazonaws.com/2025-01-23/'

 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
@@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-30/'
+VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2025-01-23/'

 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
@@ -0,0 +1,44 @@
+# just a flag
+ENV = 'usa'
+NODE_ENV = 'usa'
+# base public path
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-08-12/'
+
+# 是否开启登陆限制 true:是 false:否
+VUE_APP_LOGIN_FOR_PERMISSION = true
+
+# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION_MFA = true
+
+# 是否开启长时间无操作锁定弹框 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION = true
+
+# 无操作锁定弹框判断时间 单位:秒
+VUE_APP_LOCK_FOR_TIME = 900
+
+# 是否开启长时间无操作登出 true:是 false:否
+VUE_APP_LOGOUT_FOR_PERMISSION = true
+
+# 无操作锁定弹框判断时间 单位:秒
+VUE_APP_LOGOUT_FOR_TIME = 1800
+
+# 是否开启密码正则验证 true:是 false:否
+VUE_APP_PASSWORD_FOR_PERMISSION = true
+
+# 是否开启密码正则验证 true:是 false:否
+VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
+
+# 是否开启文档签署验证 true:是 false:否
+VUE_APP_WORD_FOR_PERMISSION = true
+
+# 公司名称
+VUE_APP_COMPANY_NAME = "Elevate Imaging"
+
+# dicom文件地址
+VUE_APP_DICOM_PATH = 'https://zyypacs-uat.oss-cn-shanghai.aliyuncs.com'
+
+VUE_APP_OSS_CONFIG_REGION = 'oss-cn-shanghai'
+
+VUE_APP_OSS_CONFIG_BUCKET = 'zyypacs-uat'
+
+VUE_APP_OSS_PATH = '/usa/dist'
@@ -6,6 +6,7 @@
    "build": "vue-cli-service build",
    "build:prod": "vue-cli-service  build --mode prod",
    "build:uat": "vue-cli-service  build --mode uat",
+    "build:usa_test": "vue-cli-service  build --mode usa_test",
    "build:usa": "vue-cli-service  build --mode usa",
    "build:usa_prod": "vue-cli-service  build --mode usa_prod",
    "pre": "vue-cli-service build --mode pre",
@@ -209,9 +209,9 @@ export default {
          [],
          this.arr.filter(
            (v) =>
-              ~v.Code.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.Value.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase())
+              ~v.Code.indexOf(this.key) ||
+              ~v.Value.indexOf(this.key) ||
+              ~v.ValueCN.indexOf(this.key)
          )
        )
      } else {
@@ -10,16 +10,12 @@
          <el-input v-model="searchData.Version" style="width: 100px" />
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
-          </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t('common:button:reset') }}
-          </el-button>
+          <el-button type="primary" @click="handleReset">{{
+            $t("dictionary:browser:button:reset")
+          }}</el-button>
+          <el-button type="primary" @click="handleSearch">{{
+            $t("dictionary:browser:button:search")
+          }}</el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left: auto">
@@ -16,16 +16,8 @@
          <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
-          </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t('common:button:reset') }}
-          </el-button>
+          <el-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" @click="handleSearch">Search</el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
@@ -27,16 +27,8 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
-          </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t('common:button:reset') }}
-          </el-button>
+          <el-button type="primary" @click="handleReset">重置</el-button>
+          <el-button type="primary" @click="handleSearch">查询</el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
@@ -8,16 +8,9 @@
              <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
            </el-form-item>
            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-                {{ $t('common:button:search') }}
-              </el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh-left"
-                @click="handleReset"
-              >
-                {{ $t('common:button:reset') }}
-              </el-button>
+              <el-button type="primary" @click="handleReset">重置</el-button>
+              <el-button type="primary" @click="handleSearch">查询</el-button>
+
            </el-form-item>
          </el-form>
          <div>
@@ -57,16 +57,8 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
-          </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t('common:button:reset') }}
-          </el-button>
+          <el-button type="primary" @click="handleReset">重置</el-button>
+          <el-button type="primary" @click="handleSearch">查询</el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
@@ -16,16 +16,8 @@
          <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
-          </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t('common:button:reset') }}
-          </el-button>
+          <el-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" @click="handleSearch">Search</el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
@@ -38,16 +38,8 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
-          </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t('common:button:reset') }}
-          </el-button>
+          <el-button type="primary" @click="handleReset">重置</el-button>
+          <el-button type="primary" @click="handleSearch">查询</el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
@@ -26,16 +26,8 @@
          <el-input v-model="searchData.Type" clearable style="width:120px;" />
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
-          </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t('common:button:reset') }}
-          </el-button>
+          <el-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" @click="handleSearch">Search</el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
@@ -123,16 +123,8 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
-          </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t('common:button:reset') }}
-          </el-button>
+          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" @click="handleReset">重置</el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left: auto">
@@ -3,23 +3,15 @@
    <!-- 搜索框 -->
    <div class="search">
      <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="Code:">
+        <el-form-item label="编号:">
          <el-input v-model="searchData.Code" style="width:100px;" />
        </el-form-item>
        <el-form-item label="模板:">
          <el-input v-model="searchData.Name" style="width:100px;" />
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
-          </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t('common:button:reset') }}
-          </el-button>
+          <el-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" @click="handleSearch">Search</el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto;">
@@ -6,14 +6,7 @@
    <div class="login-body">
      <div class="login-l">
        <div class="login-logo">
-          <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
-          <img
-            v-else-if="NODE_ENV === 'usa'"
-            src="@/assets/zzlogo-usa.png"
-            alt=""
-            class="usa-logo"
-          />
-          <img v-else src="@/assets/zzlogo4.png" alt="" />
+          <img src="@/assets/zzlogo-usa.png" alt="" class="usa-logo" />
        </div>
        <div
          :class="{
@@ -437,7 +437,7 @@ export default {
    },
    handlePreview3(row) {
      return this.$preview({
-        path: row.Path || row.FilePath,
+        path: row.FilePath,
        type: 'pdf',
        title: row.FileName,
      })
@@ -447,7 +447,7 @@ export default {
    },
    handlePreview2(row, r2) {
      return this.$preview({
-        path: row.Path || row.fullPath,
+        path: row.fullPath,
        type: 'pdf',
        title: row.FileName,
      })
@@ -537,7 +537,7 @@ export default {
    handlePreview(row) {
      console.log(row)
      return this.$preview({
-        path: row.Path || row.FullPath,
+        path: row.FullPath,
        type: 'pdf',
        title: row.FileName,
      })
@@ -333,7 +333,7 @@ export default {
    },
    preview(row) {
      this.$preview({
-        path: row.Path || row.FullPath,
+        path: row.FullPath,
        type: 'pdf',
        title: row.FileName,
      })
@@ -292,7 +292,7 @@ export default {
    },
    preview(row) {
      this.$preview({
-        path: row.Path || row.FullPath,
+        path: row.FullPath,
        type: 'pdf',
        title: row.FileName,
      })
@@ -1015,7 +1015,7 @@ export default {
      }
    },
    preview(row) {
-      let path = row.Path || row.FullPath || row.FilePath
+      let path = row.FullPath || row.FilePath
      this.$preview({
        path: path,
        type: 'pdf',
@@ -392,17 +392,15 @@ export default {
        },
      ],
      searchHandle: [
-        {
-          label: this.$t('common:button:search'),
-          type: 'primary',
-          emitKey: 'search',
-          icon: 'el-icon-search'
-        },
        {
          label: this.$t('common:button:reset'),
          type: 'primary',
          emitKey: 'reset',
-          icon: 'el-icon-refresh-left'
+        },
+        {
+          label: this.$t('common:button:search'),
+          type: 'primary',
+          emitKey: 'search',
        },
        {
          label: this.$t('common:button:new'),
@@ -1,14 +1,7 @@
 <template>
  <div class="trials-navbar" style="position: relative">
    <div class="leftMenu">
-      <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
-      <img
-        v-else-if="NODE_ENV === 'usa'"
-        src="@/assets/title-logo.png"
-        alt=""
-        class="title-logo"
-      />
-      <img v-else src="@/assets/zzlogo4.png" alt="" />
+      <img src="@/assets/title-logo.png" alt="" class="title-logo" />
      <span style="white-space: nowrap" v-if="NODE_ENV !== 'usa'">
        <!-- 中心影像系统（EICS） -->
        {{ $t('trials:trials:title:eics') }}
@@ -332,12 +332,13 @@
      <template slot="dialog-body">
        <div style="width: 100%; display: flex">
          <div class="shareLink">
-            <!-- <div>
+            <div>
              <i style="color: #428bca" class="el-icon-success" />
+              <!-- 成功创建调查表链接 -->
              <span>{{
                $t('trials:researchRecord:message:createLinkSuccessfully')
              }}</span>
-            </div> -->
+            </div>
            <div style="margin: 10px 0">
              <!-- 链接： -->
              {{ $t('trials:researchRecord:label:link') }}
@@ -30,7 +30,7 @@
                        style="margin:0 10px;"
                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
                      >
-                        <el-button type="text" @click="previewImage(file.ImagePath)" style="width: 400px;white-space: normal; word-wrap: break-word;text-align: left;">
+                        <el-button type="text" @click="previewImage(file.ImagePath)">
                          {{ file.FileName }}
                        </el-button>
                        <img
@@ -31,7 +31,7 @@
                        style="margin:0 10px;"
                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
                      >
-                        <el-button type="text" @click="previewImage(file.ImagePath)" style="width: 400px;white-space: normal; word-wrap: break-word;text-align: left;">
+                        <el-button type="text" @click="previewImage(file.ImagePath)">
                          {{ file.FileName }}
                        </el-button>
                        <img
@@ -771,7 +771,6 @@
              <el-button
                v-if="scope.row.FileName && scope.row.ClinicalUploadType"
                circle
-                :title="$t('common:button:download')"
                icon="el-icon-download"
                @click="handleDownloadTpl(scope.row)"
              >
@@ -779,7 +778,6 @@
              <el-button
                v-if="scope.row.FileName && !scope.row.ClinicalUploadType"
                circle
-                :title="$t('common:button:preview')"
                icon="el-icon-view"
                @click="handlePreviewTpl(scope.row)"
              >
@@ -787,7 +785,6 @@
              <el-button
                v-if="scope.row.ClinicalUploadType === 2"
                circle
-                :title="$t('common:button:preview')"
                icon="el-icon-view"
                @click="handlePreview(scope.row)"
              >
@@ -121,19 +121,7 @@
                :label="$t('trials:audit:table:bodyPart')"
              >
                <template slot-scope="scope">
-                  <el-tooltip
-                    class="item"
-                    effect="dark"
-                    :content="$t('trials:audit:message:noBodyPartForEdit')"
-                    placement="bottom"
-                    v-if="!scope.row.BodyPartForEdit"
-                  >
-                    <i
-                      class="el-icon-warning"
-                      style="color: #f44336; font-size: 16px"
-                    />
-                  </el-tooltip>
-                  <span v-else>{{ getBodyPart(scope.row.BodyPartForEdit) }}</span>
+                  {{ getBodyPart(scope.row.BodyPartForEdit) }}
                </template>
              </el-table-column>
              <!-- 序列数量 -->
@@ -233,14 +233,14 @@
              <div class="my_select_box" :class="{selected: selected === 'NeedSignedTrialDoc'}" tab-data="NeedSignedTrialDoc" @click="selected = 'NeedSignedTrialDoc'" v-if="!hasPermi(['role:zys'])">
                <div class="my_select_box_content">
                  <span class="el-icon-receiving" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span class="my_select_box_content_text" :title="$t('trials:workbench:title:trialDocSigned')">{{ $t('trials:workbench:title:trialDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.TrialSignedDocCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:trialDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.TrialSignedDocCount }}</span>
                </div>
              </div>
              <!-- 系统已签署文件 -->
              <div class="my_select_box" :class="{selected: selected === 'NeedSignedSysDoc'}" tab-data="NeedSignedSysDoc" @click="$nextTick(() => selected = 'NeedSignedSysDoc')" v-if="!hasPermi(['role:zys'])">
                <div class="my_select_box_content">
                  <span class="el-icon-data-line" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span class="my_select_box_content_text" :title="$t('trials:workbench:title:sysDocSigned')">{{ $t('trials:workbench:title:sysDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SysSignedDocCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:sysDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SysSignedDocCount }}</span>
                </div>
              </div>
            </div>
@@ -11,7 +11,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = process.env.NODE_ENV === 'usa' ? 'LILI' : defaultSettings.title || 'IRCIS' // page title
+const name = process.env.NODE_ENV === 'usa' ? 'LiLi' : defaultSettings.title || 'IRCIS' // page title

 // eslint-disable-next-line no-undef
 module.exports = {
Author	SHA1	Message	Date
wangxiaoshuang	24303b208d	Merge branch 'main' into uat_us	2025-01-23 18:41:20 +08:00
wangxiaoshuang	296c251847	1	2025-01-23 18:40:25 +08:00
wangxiaoshuang	3b9e5cddb7	Merge branch 'main' into uat_us	2025-01-23 16:37:18 +08:00
wangxiaoshuang	d11092338d	打包配置修改	2025-01-23 14:06:28 +08:00
wangxiaoshuang	848427ac3c	Merge branch 'main' into uat_us	2025-01-23 13:03:36 +08:00
wangxiaoshuang	d70cffe306	Merge branch 'main' into uat_us	2025-01-22 15:29:37 +08:00
wangxiaoshuang	0cd44bf4c6	Merge branch 'main' into uat_us	2025-01-21 15:51:22 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	a2939e52b2	v1.7.0发布	2024-10-14 17:05:51 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	99e6f700c3	国际化修改	2024-09-14 10:33:27 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	45c50bf67d	1.6版本发布	2024-09-05 11:15:04 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	19e3177e23	Merge branch 'uat' into uat_us	2024-09-05 10:45:21 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	437010c0f7	1	2024-08-30 13:40:35 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	01b3d6e85e	1	2024-08-12 15:43:38 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	cb032485e1	Merge branch 'uat' into uat_us	2024-08-12 14:39:21 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	4b771a9d70	1	2024-08-12 13:43:26 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	86321d8405	Merge branch 'uat' into uat_us	2024-08-12 13:42:50 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	b9f3b24608	Merge branch 'uat' into uat_us	2024-08-09 13:42:57 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	bde8a7d572	1	2024-08-09 13:12:16 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	267ee60fc2	Merge branch 'uat' into uat_us	2024-08-09 13:11:36 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	ef891857c4	1	2024-08-08 16:42:14 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	787f6425e0	Merge branch 'uat' into uat_us	2024-08-08 16:41:40 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	4929bb594d	Merge branch 'uat' into uat_us	2024-08-07 18:31:12 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	4b9c2a073b	1	2024-08-07 18:17:17 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	861c7022b9	Merge branch 'uat' into uat_us	2024-08-07 18:17:05 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	21e0568b90	Merge branch 'uat' into uat_us	2024-08-07 17:27:36 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	ffc9372c25	Merge branch 'uat' into uat_us	2024-08-07 16:20:52 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	a58a6e4931	Merge branch 'uat' into uat_us	2024-08-07 15:33:24 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	6ac94ec1a0	Merge branch 'uat' into uat_us	2024-08-02 14:17:49 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	ddc175961c	Merge branch 'uat' into uat_us	2024-08-02 14:09:18 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	098a838c1e	美国测试环境	2024-08-02 09:52:14 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	6bb7d47511	Merge branch 'uat' into uat_us	2024-07-31 14:08:34 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	8e641300d2	1	2024-07-30 18:09:14 +08:00