Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanMapper.xml

@@ -131,18 +131,18 @@
 
 
     <select id="selectByPlanId" resultType="com.xunmei.core.resumption.vo.appPlan.RuleItemVo">
-        SELECT a.item_id,
-               b.name as item_name,
-               b.desc as item_desc,
---                b.item_num,
+        SELECT
+            h.point_id as id,
+            a.item_id,
+            b.NAME AS item_name,
+            b.DESC AS item_desc,--                b.item_num,
 --                a.safe_type,
-               c.`name`           area_name,
-               a.name as point_name,
---                a.point_num,
-               h.point_scan,
-               h.required,
-               d.name  as ruleName,
-               a.business_type as businessType
+            c.`name` area_name,
+            a.NAME AS point_name,--                a.point_num,
+            h.point_scan,
+            h.required,
+            d.NAME AS ruleName,
+            a.business_type AS businessType
         FROM (SELECT point_id, point_scan, required FROM core_resumption_plan_to_point WHERE plan_id = #{planId}) h
                  LEFT JOIN core_resumption_rule_point a ON h.point_id = a.id
                  LEFT JOIN core_resumption_rule_item b ON a.item_id = b.id