Merge remote-tracking branch 'origin/master'

liujie

2023-07-26 4153d83ed2211f5773b63045e61f02124f32f490

 cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html

@@ -83,7 +83,7 @@

@if(language==1){
<div class="row" style="margin-left: 2%;">
    <input hidden id="language" value="${language}">

    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <div class="ibox float-e-margins">
@@ -157,7 +157,7 @@
@}
@if(language==2){
<div class="row" style="margin-left: 2%;">
    <input hidden id="language" value="${language}">

    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <div class="ibox float-e-margins">
@@ -231,7 +231,7 @@
@}
@if(language==3){
<div class="row" style="margin-left: 2%;">
    <input hidden id="language" value="${language}">

    <div class="col-sm-3">
        <input id="activityId" value="${activityId}" type="hidden">
        <div class="ibox float-e-margins">