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

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -153,8 +153,8 @@
         io.deptid,
         io.deptname,
         io.agreeid,
-        iac.productid,
-        iac.product,
+        io.productid,
+        io.product,
         iac.createtime,
         io.frameno,
         io.licenseno,

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -245,7 +245,7 @@
                iac.signing_time as signingTime,
                iac.pay_date  as payDate,
                iac.agreement_id,
-               iac.entry_status,
+               o.entry_status,
                eic.namesimple as partnerCompaniesName
         from ins_orders as o
                  join ins_area_company iac on o.orderno = iac.orderno