Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/projectRecords/domain/Project.java

@@ -216,6 +216,8 @@ public class Project extends BaseEntity {
 
     /**
      * 归属公司
+     * tableColumn 数据库中sql查询使用到的值
+     * javaField 实体类中对应的字段
      */
     @Query(type = QueryType.EQ, tableColumn = "su.company_id", javaField = "companyDTO.id")
     private OfficeDTO companyDTO;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/projectRecords/mapper/xml/ProjectMapper.xml

@@ -59,14 +59,45 @@
   </sql>
 
   <sql id="to_list">
-    pr.id, pr.create_by, pr.create_date, pr.update_by, pr.update_date, pr.remarks, pr.del_flag, pr.customer_name,
-    pr.project_name, pr.evaluation_objective, pr.project_type, pr.evaluation_base_date, pr.evaluation_report_date,
-    pr.protocol_num, pr.document_num, pr.wayst_evaluation, pr.fixed_assets_evaluation,
-    pr.net_assets_evaluation, pr.rent_evaluation, pr.forensics, pr.report_charges, pr.current_dispose_person,
-    pr.is_invoice, pr.invoice_date, pr.actual_charges, pr.is_contract_archive, pr.is_papers_intact,
-    pr.is_papers_archive, pr.ops_amount, pr.is_ops_reimbursement, pr.reimbursement_amount, pr.unreimbursed_amount,
-    pr.reimbursement_num, pr.reimbursement_date,
-    pr.`status`, pr.assess_report_message, pr.assess_base_message, pr.invoice_message, pr.is_commission_reimbursement,
+    pr.id,
+    pr.create_by,
+    pr.create_date,
+    pr.update_by,
+    pr.update_date,
+    pr.remarks,
+    pr.del_flag,
+    pr.customer_name,
+    pr.project_name,
+    pr.evaluation_objective,
+    pr.project_type,
+    pr.evaluation_base_date,
+    pr.evaluation_report_date,
+    pr.protocol_num,
+    pr.document_num,
+    pr.wayst_evaluation,
+    pr.fixed_assets_evaluation,
+    pr.net_assets_evaluation,
+    pr.rent_evaluation,
+    pr.forensics,
+    pr.report_charges,
+    pr.current_dispose_person,
+    pr.is_invoice,
+    pr.invoice_date,
+    pr.actual_charges,
+    pr.is_contract_archive,
+    pr.is_papers_intact,
+    pr.is_papers_archive,
+    pr.ops_amount,
+    pr.is_ops_reimbursement,
+    pr.reimbursement_amount,
+    pr.unreimbursed_amount,
+    pr.reimbursement_num,
+    pr.reimbursement_date,
+    pr.`status`,
+    pr.assess_report_message,
+    pr.assess_base_message,
+    pr.invoice_message,
+    pr.is_commission_reimbursement,
     pr.item_type
   </sql>