Merge remote-tracking branch 'origin/StableVersion' into dev_vite

src/component/home/design/index.vue

@@ -1911,7 +1911,7 @@ export default defineComponent({
 			if(design?.childList?.length > 0){
 				await new Promise((resolve, reject) => {
 					Modal.confirm({
-						title: this.t('LibraryPage.jsContent11'),
+						title: this.t('HomeView.jsContent12'),
 						icon: createVNode(ExclamationCircleOutlined),
 						okText: 'Yes',
 						cancelText: 'No',

src/component/home/newProject/workspace.vue

@@ -43,7 +43,6 @@
 			</div>
 			<div class="style brand marginBottom">
 				<div class="text">{{$t('Habit.Brand')}}:</div>
-				<!-- <div class="text"><img v-show="selectObject.userBrandDna" :src="selectObject.userBrandDnaImg">{{ selectObject.userBrandDnaName }}</div> -->
 				<div class="gallery_btn" @click="setBrandDNA">{{ $t('Habit.Select') }}</div>
 			</div>
 			<div class="brandImg" v-if="selectObject.userBrandDna"><img :src="selectObject.userBrandDnaImg"></div>