Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lib/model/patrol_response_entity.dart
#	lib/page/patrol/patrol_job_detail.dart

lib/common/style/gsy_style.dart

@@ -164,8 +164,8 @@ class GSYConstant {
   );
 
   static const normalTextActionWhiteBold = TextStyle(
-    color: GSYColors.actionBlue,
-    fontSize: normalTextSize,
+    color: Colors.blue,
+    fontSize: middleTextWhiteSize,
     fontWeight: FontWeight.bold,
   );
 
@@ -174,6 +174,12 @@ class GSYConstant {
     fontSize: normalTextSize,
   );
 
+  static const smallTextLight = TextStyle(
+    color: GSYColors.primaryLightValue,
+    fontSize: smallTextSize,
+  );
+
+
   static const normalTextBigWhiteBold = TextStyle(
     color: GSYColors.actionBlue,
     fontSize: bigTextSize,

lib/model/patrol_response_entity.dart

@@ -75,8 +75,8 @@ class PatrolJobDetailData with JsonConvert<PatrolJobDetailData> {
 class PatrolJobItemData with JsonConvert<PatrolJobItemData> {
   late String name;
   late String result;
-
-  PatrolJobItemData(this.name, this.result);
+  late int id;
+  PatrolJobItemData(this.name,this.result,this.id);
 }
 
 class PatrolJobImageData with JsonConvert<PatrolJobImageData> {