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

src/views/settlementManagement/cycleModel/cycleModel.vue

@@ -105,7 +105,7 @@
   function handleSubmit() {
     validate().then(() => {
       const value = getFieldsValue();
-      cycleData.value.fillCycle = value.year + value.quarter;
+      cycleData.value.fillCycle = value.year +'年'+ value.quarter;
       console.log('!!!!!!!!-', cycleData.value.fillCycle)
       SetSettlementMothCycelEdit(cycleData.value).then(() => {
         emit('getCycle');