Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

     /** 申请人主张违约金 */
     @Excel(name = "申请人主张违约金")
     private BigDecimal claimLiquidDamag;
+    /** 申请人请求仲裁庭裁决 */
+    @Excel(name = "申请人请求仲裁庭裁决",width = 36)
+    private String requestRule;
+
+    /** 是否财产保全申请 */
+    @Excel(name = "是否财产保全申请",width = 26,combo= {"是","否"},readConverterExp = "0=否,1=是")
+    private Integer properPreser;
     /** 申请人仲裁请求及事实和理由 */
     @Excel(name = "申请人仲裁请求及事实和理由",width = 36)
     private String arbitratClaims;
     /** 是否需要开庭审理 */
     private Integer openCourtHear;
 
-    /** 申请人请求仲裁庭裁决 */
-    @Excel(name = "申请人请求仲裁庭裁决",width = 36)
-    private String requestRule;
+
     /** 是否仲裁反请求 */
     private Integer adjudicaCounter;
-    /** 是否财产保全申请 */
-    private Integer properPreser;
+
     /** 被申请人是否缺席 */
     private Integer isAbsence;
     /** 是否管辖异议申请 */
     /** 姓名 */
     @Excel(name = "申请人主体信息-申请人(机构)",width = 26)
     private String name;
-
+    /** 身份证号 */
+    @Excel(name = "申请人主体信息-代码",width = 26)
+    private String identityNum;
+    /** 申请人主体信息-法定代表人 */
+    @Excel(name = "申请人主体信息-法定代表人",width = 26)
+    private String compLegalPerson;
+    /** 申请人主体信息-法定代表人 */
+    @Excel(name = "申请人主体信息-法定代表人职位",width = 26)
+    private String compLegalperPost;
     /**
      * 申请人主体信息-申请人(机构)id
      */
     private String nameId;
-    /** 身份证号 */
-    @Excel(name = "申请人主体信息-代码",width = 26)
-    private String identityNum;
 
     /** 联系电话 */
     @Excel(name = "申请人主体信息-联系电话",width = 26)
     /** 联系地址 */
     @Excel(name = "申请人主体信息-联系地址",width = 26)
     private String contactAddress;
-
     /** 单位电话 */
     @Excel(name = "申请人主体信息-单位电话",width = 26)
     private String workTelphone;
     /** 单位地址 */
     @Excel(name = "申请人主体信息-单位地址",width = 26)
     private String workAddress;
-    /** 申请人主体信息-法定代表人 */
-    @Excel(name = "申请人主体信息-法定代表人",width = 26)
-    private String compLegalPerson;
-    /** 申请人主体信息-法定代表人 */
-    @Excel(name = "申请人主体信息-法定代表人职位",width = 26)
-    private String compLegalperPost;
+
     /** 申请人住所 */
     @Excel(name = "申请人主体信息-住所",width = 26)
     private String residenAffiliAppli;
     @Excel(name = "被申请人主体信息-身份证号",width = 26)
     private String debtorIdentityNum;
     /** 被申请人主体信息-性别 */
-    @Excel(name = "被申请人主体信息-性别",width = 26)
+    @Excel(name = "被申请人主体信息-性别",width = 26,combo= {"男","女"},readConverterExp = "0=男,女=1")
     private String responSex;
 
     public Date getResponBirth() {

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

             <if test="caseDescribe != null  and caseDescribe != ''">case_describe = #{caseDescribe},</if>
             <if test="caseResult != null  and caseResult != ''">case_result = #{caseResult},</if>
             <if test="caseStatus != null">case_status = #{caseStatus},</if>
+            <if test="properPreser != null">proper_preser = #{properPreser},</if>
 
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
             <if test="caseNum != null and caseNum != ''">case_num = #{caseNum},</if>