Merge branch 'dev' into songshankun/add-token

songshankun

2023-10-12 94ad4de767b25b0e6b2486287da90a7cb78ad3d3

 src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue

@@ -45,7 +45,7 @@
                      </el-button
                      ></span
                 >
                 <span  v-else>自动生成</span>
                 <span v-else>{{editConfig.title==='新建'? '自动生成': editConfig.infomation.number}}</span>
               </el-form-item>
             </el-col>
              <el-col :span="12">