Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-23 9af336a5be2483d67b5dbbf02d87e1e54185014f

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html

@@ -454,6 +454,7 @@
                    </div>
                </div>
            </div>
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">