Merge remote-tracking branch 'origin/master'

src/views/cw/workClientInfo/clientUserSelect/UserSelectDialog.vue

@@ -72,6 +72,7 @@
 										  :label="scope.row.id"
 										  :value="dataListAllSelections[0]&&dataListAllSelections[0].id"
 										  @change.native="getTemplateRow(scope.$index,scope.row)">
+									<span></span>
 								</el-radio>
 							</template>
 						</el-table-column>

src/views/cw/workContract/ContractRegistration.vue

@@ -608,6 +608,7 @@
         }
         if (type === 'rebackBorrow') {
           row.borrowType = '0'
+			row.createTime = '';
           this.cwWorkContractBorrowService.updateStatusByContractInfoId(row).then(() => {
             this.cwWorkContractBorrowService.deleteById(row.id)
           })