no message

src/views/week/doubleHistoricalWeeklyDetils.vue

@@ -61,7 +61,6 @@
                     readonly
                     type="textarea" />
                 </div>
-                >>>>>>> feature_20260319_生动化陈列照片最少数量限制
               </div>
             </div>
           </van-collapse-item>